Merge branch 'master' into add-resolverver

rust-secure-code · Jan 22, 2025 · 9702f03 · 9702f03
2 parents 4ea1b6f + 77bc08b
commit 9702f03
Show file tree

Hide file tree

Showing 5 changed files with 388 additions and 19 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -24,24 +24,12 @@ jobs:
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-cargo-index-${{ hashFiles('Cargo.lock') }}
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.toolchain }}
-          target: "wasm32-unknown-unknown"
+          targets: "wasm32-unknown-unknown,i686-unknown-linux-gnu,x86_64-unknown-linux-musl"
           profile: minimal
           override: true
-      # multiple additional targets are not supported, so we invoke the action multiple times
-      # Feature request: https://github.com/actions-rs/toolchain/issues/165
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ matrix.toolchain }}
-          profile: minimal
-          target: "i686-unknown-linux-gnu"
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: ${{ matrix.toolchain }}
-          profile: minimal
-          target: "x86_64-unknown-linux-musl"
       - name: "Test on the native x86_64-unknown-linux-gnu"
         run: cargo test --all-features --workspace
       - name: "Test cross-compiling to x86_64-unknown-linux-musl"

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -24,10 +24,10 @@ jobs:
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-cargo-index-${{ hashFiles('Cargo.lock') }}
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.toolchain }}
           profile: minimal
           override: true
-          target: "wasm32-unknown-unknown"
+          targets: "wasm32-unknown-unknown"
       - run: cargo test --all-features --workspace
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -24,12 +24,12 @@ jobs:
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-cargo-index-${{ hashFiles('Cargo.lock') }}
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.toolchain }}
           profile: minimal
           override: true
-          target: "wasm32-unknown-unknown"
+          targets: "wasm32-unknown-unknown"
       - name: "Test on the native x86_64-pc-windows-mscv"
         run: cargo test --all-features --workspace
       - name: "Test when cross-compiling to x86_64-pc-windows-gnu"