Skip to content

Commit 73e09fd

Browse files
authored
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
1 parent 37d9e36 commit 73e09fd

File tree

5 files changed

+10
-30
lines changed

5 files changed

+10
-30
lines changed

.github/workflows/coverage.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818
cancel-in-progress: true
1919

2020
env:
21-
TARPAULIN_VERSION: 0.19.1
21+
TARPAULIN_VERSION: 0.27.1
2222
# LIBCLANG_PATH: "/usr/lib/llvm-11/lib" # default `llvm-config --prefix`
2323
CARGO_INCREMENTAL: 0
2424
jobs:
@@ -40,17 +40,13 @@ jobs:
4040
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
4141
- name: Install toolchain
4242
uses: dtolnay/rust-toolchain@nightly
43-
with:
44-
toolchain: nightly-2023-04-15
45-
components: rustfmt
46-
target: wasm32-unknown-unknown
4743
- name: Setup cmake
4844
uses: jwlawson/actions-setup-cmake@v1.13
4945
- name: Run cargo-tarpaulin
5046
run: |
51-
wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz
52-
tar -zxvf cargo-tarpaulin-${{ env.TARPAULIN_VERSION }}-travis.tar.gz -C $HOME/.cargo/bin
53-
cargo tarpaulin -v --no-fail-fast --workspace \
47+
wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz
48+
tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
49+
cargo tarpaulin -v --no-fail-fast --implicit-test-threads --workspace \
5450
-e acala-inspect \
5551
acala acala-cli e2e-tests acala-service \
5652
acala-primitives \

.github/workflows/test.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ jobs:
3838
- name: Install toolchain
3939
uses: dtolnay/rust-toolchain@nightly
4040
with:
41-
toolchain: nightly-2023-04-15
4241
components: rustfmt
43-
target: wasm32-unknown-unknown
4442
- name: Setup cmake
4543
uses: jwlawson/actions-setup-cmake@v1.13
4644
- name: Check format
47-
run: cargo fmt --all -- --check
45+
run: cargo +nightly fmt --all -- --check
4846
- name: Build
4947
run: make build-all
5048
- name: Install clippy
@@ -75,10 +73,6 @@ jobs:
7573
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
7674
- name: Install toolchain
7775
uses: dtolnay/rust-toolchain@nightly
78-
with:
79-
toolchain: nightly-2023-04-15
80-
components: rustfmt
81-
target: wasm32-unknown-unknown
8276
- name: Install cargo-nextest
8377
uses: taiki-e/install-action@nextest
8478
- name: Setup cmake
@@ -103,10 +97,6 @@ jobs:
10397
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
10498
- name: Install toolchain
10599
uses: dtolnay/rust-toolchain@nightly
106-
with:
107-
toolchain: nightly-2023-04-15
108-
components: rustfmt
109-
target: wasm32-unknown-unknown
110100
- name: Install cargo-nextest
111101
uses: taiki-e/install-action@nextest
112102
- name: Setup cmake
@@ -139,10 +129,6 @@ jobs:
139129
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
140130
- name: Install toolchain
141131
uses: dtolnay/rust-toolchain@nightly
142-
with:
143-
toolchain: nightly-2023-04-15
144-
components: rustfmt
145-
target: wasm32-unknown-unknown
146132
- name: Setup cmake
147133
uses: jwlawson/actions-setup-cmake@v1.13
148134
- name: Run e2e tests

.github/workflows/test.yml.src

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,12 @@ jobs:
4242
name: Install toolchain
4343
uses: dtolnay/rust-toolchain@nightly
4444
with:
45-
toolchain: nightly-2023-04-15
4645
components: rustfmt
47-
target: wasm32-unknown-unknown
4846
- &cmake
4947
name: Setup cmake
5048
uses: jwlawson/actions-setup-cmake@v1.13
5149
- name: Check format
52-
run: cargo fmt --all -- --check
50+
run: cargo +nightly fmt --all -- --check
5351
- name: Build
5452
run: make build-all
5553
- name: Install clippy

.github/workflows/update-tokens.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ jobs:
1919
persist-credentials: false
2020
- name: Install toolchain
2121
uses: dtolnay/rust-toolchain@nightly
22-
with:
23-
toolchain: nightly-2023-04-15
24-
components: rustfmt
25-
target: wasm32-unknown-unknown
2622
- name: update tokens
2723
env:
2824
GITHUB_TOKEN: ${{ secrets.GH_PAT }}

rust-toolchain.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[toolchain]
2+
channel = "1.73.0"
3+
components = ["rustfmt", "clippy"]
4+
targets = ["wasm32-unknown-unknown"]

0 commit comments

Comments
 (0)