Update tarpaulin (#2628)

* Update tarpaulin * update url * try llvm engine * try lld * try single thread * try stable * use stable * try rust-toolchain.toml * update toolchain * fix * fix
AcalaNetwork · Oct 9, 2023 · 73e09fd · 73e09fd
1 parent 37d9e36
commit 73e09fd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 30 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -18,7 +18,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  TARPAULIN_VERSION: 0.19.1
+  TARPAULIN_VERSION: 0.27.1
   # LIBCLANG_PATH: "/usr/lib/llvm-11/lib" # default `llvm-config --prefix`
   CARGO_INCREMENTAL: 0
 jobs:
@@ -40,17 +40,13 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
-        with:
-          toolchain: nightly-2023-04-15
-          components: rustfmt
-          target: wasm32-unknown-unknown
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v1.13
       - name: Run cargo-tarpaulin
         run: |
-          wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz
-          tar -zxvf cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz -C $HOME/.cargo/bin
-          cargo tarpaulin -v --no-fail-fast --workspace \
+          wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz
+          tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
+          cargo tarpaulin -v --no-fail-fast --implicit-test-threads --workspace \
             -e acala-inspect \
             acala acala-cli e2e-tests acala-service \
             acala-primitives \

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,13 +38,11 @@ jobs:
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-04-15
           components: rustfmt
-          target: wasm32-unknown-unknown
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v1.13
       - name: Check format
-        run: cargo fmt --all -- --check
+        run: cargo +nightly fmt --all -- --check
       - name: Build
         run: make build-all
       - name: Install clippy
@@ -75,10 +73,6 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
-        with:
-          toolchain: nightly-2023-04-15
-          components: rustfmt
-          target: wasm32-unknown-unknown
       - name: Install cargo-nextest
         uses: taiki-e/install-action@nextest
       - name: Setup cmake
@@ -103,10 +97,6 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
-        with:
-          toolchain: nightly-2023-04-15
-          components: rustfmt
-          target: wasm32-unknown-unknown
       - name: Install cargo-nextest
         uses: taiki-e/install-action@nextest
       - name: Setup cmake
@@ -139,10 +129,6 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
-        with:
-          toolchain: nightly-2023-04-15
-          components: rustfmt
-          target: wasm32-unknown-unknown
       - name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v1.13
       - name: Run e2e tests

diff --git a/.github/workflows/test.yml.src b/.github/workflows/test.yml.src
@@ -42,14 +42,12 @@ jobs:
         name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2023-04-15
           components: rustfmt
-          target: wasm32-unknown-unknown
       - &cmake
         name: Setup cmake
         uses: jwlawson/actions-setup-cmake@v1.13
       - name: Check format
-        run: cargo fmt --all -- --check
+        run: cargo +nightly fmt --all -- --check
       - name: Build
         run: make build-all
       - name: Install clippy

diff --git a/.github/workflows/update-tokens.yml b/.github/workflows/update-tokens.yml
@@ -19,10 +19,6 @@ jobs:
           persist-credentials: false
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
-        with:
-          toolchain: nightly-2023-04-15
-          components: rustfmt
-          target: wasm32-unknown-unknown
       - name: update tokens
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.73.0"
+components = ["rustfmt", "clippy"]
+targets = ["wasm32-unknown-unknown"]