Skip to content

Commit 77bc08b

Browse files
authored
Merge pull request #184 from rust-secure-code/fix-ci
Migrate to a maintained toolchain action
2 parents 83713a1 + c67a74b commit 77bc08b

File tree

5 files changed

+388
-19
lines changed

5 files changed

+388
-19
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,12 @@ jobs:
2424
with:
2525
path: ~/.cargo/git
2626
key: ${{ runner.os }}-cargo-index-${{ hashFiles('Cargo.lock') }}
27-
- uses: actions-rs/toolchain@v1
27+
- uses: dtolnay/rust-toolchain@stable
2828
with:
2929
toolchain: ${{ matrix.toolchain }}
30-
target: "wasm32-unknown-unknown"
30+
targets: "wasm32-unknown-unknown,i686-unknown-linux-gnu,x86_64-unknown-linux-musl"
3131
profile: minimal
3232
override: true
33-
# multiple additional targets are not supported, so we invoke the action multiple times
34-
# Feature request: https://github.com/actions-rs/toolchain/issues/165
35-
- uses: actions-rs/toolchain@v1
36-
with:
37-
toolchain: ${{ matrix.toolchain }}
38-
profile: minimal
39-
target: "i686-unknown-linux-gnu"
40-
- uses: actions-rs/toolchain@v1
41-
with:
42-
toolchain: ${{ matrix.toolchain }}
43-
profile: minimal
44-
target: "x86_64-unknown-linux-musl"
4533
- name: "Test on the native x86_64-unknown-linux-gnu"
4634
run: cargo test --all-features --workspace
4735
- name: "Test cross-compiling to x86_64-unknown-linux-musl"

.github/workflows/mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
with:
2525
path: ~/.cargo/git
2626
key: ${{ runner.os }}-cargo-index-${{ hashFiles('Cargo.lock') }}
27-
- uses: actions-rs/toolchain@v1
27+
- uses: dtolnay/rust-toolchain@stable
2828
with:
2929
toolchain: ${{ matrix.toolchain }}
3030
profile: minimal
3131
override: true
32-
target: "wasm32-unknown-unknown"
32+
targets: "wasm32-unknown-unknown"
3333
- run: cargo test --all-features --workspace

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
with:
2525
path: ~/.cargo/git
2626
key: ${{ runner.os }}-cargo-index-${{ hashFiles('Cargo.lock') }}
27-
- uses: actions-rs/toolchain@v1
27+
- uses: dtolnay/rust-toolchain@stable
2828
with:
2929
toolchain: ${{ matrix.toolchain }}
3030
profile: minimal
3131
override: true
32-
target: "wasm32-unknown-unknown"
32+
targets: "wasm32-unknown-unknown"
3333
- name: "Test on the native x86_64-pc-windows-mscv"
3434
run: cargo test --all-features --workspace
3535
- name: "Test when cross-compiling to x86_64-pc-windows-gnu"

0 commit comments

Comments
 (0)