fix msrv deps

risc0 · Oct 2, 2023 · 32a4701 · 32a4701
1 parent 425d254
commit 32a4701
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 92 deletions.
diff --git a/.github/workflows/blake2.yml b/.github/workflows/blake2.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/fsb.yml b/.github/workflows/fsb.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/gost94.yml b/.github/workflows/gost94.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/groestl.yml b/.github/workflows/groestl.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/k12.yml b/.github/workflows/k12.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/md2.yml b/.github/workflows/md2.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/md4.yml b/.github/workflows/md4.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/md5.yml b/.github/workflows/md5.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/ripemd.yml b/.github/workflows/ripemd.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/sha1.yml b/.github/workflows/sha1.yml
@@ -20,12 +20,10 @@ env:
 jobs:
   # Builds for no_std platforms
   build:
-    needs: set-msrv
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
           - stable
         target:
           - thumbv7em-none-eabi
@@ -36,13 +34,12 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 
   # Linux tests
   linux:
-    needs: set-msrv
     strategy:
       matrix:
         include:
@@ -57,8 +54,6 @@ jobs:
           #  deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux/x86_64
-          - target: x86_64-unknown-linux-gnu
-            rust: ${{needs.set-msrv.outputs.msrv}}
           - target: x86_64-unknown-linux-gnu
             rust: stable
 
@@ -69,7 +64,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: ${{ matrix.deps }}
       - run: cargo test --target ${{ matrix.target }} --no-default-features
@@ -79,11 +74,9 @@ jobs:
 
   # macOS tests
   macos:
-    needs: set-msrv
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
           - stable
 
     runs-on: macos-latest
@@ -93,38 +86,13 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: x86_64-apple-darwin
+          targets: x86_64-apple-darwin
           override: true
       - run: cargo test --no-default-features
       - run: cargo test
       - run: cargo test --features asm
       - run: cargo test --all-features
 
-  # Windows tests
-  windows:
-    needs: set-msrv
-    strategy:
-      matrix:
-        include:
-          # 64-bit Windows (GNU)
-          # TODO(tarcieri): try re-enabling this when we bump MSRV
-          #- target: x86_64-pc-windows-gnu
-          #  toolchain: ${{needs.set-msrv.outputs.msrv}}
-          - target: x86_64-pc-windows-gnu
-            rust: stable
-
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: risc0/risc0/.github/actions/rustup@main
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
-      - uses: msys2/setup-msys2@v2
-      - run: cargo test --target ${{ matrix.target }}
-
   # TODO: remove on MSRV bump to 1.57 or higher
   test-msrv:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/sha2.yml b/.github/workflows/sha2.yml
@@ -20,12 +20,10 @@ env:
 jobs:
   # Builds for no_std platforms
   build:
-    needs: set-msrv
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
           - stable
         target:
           - thumbv7em-none-eabi
@@ -36,27 +34,21 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 
   # Linux tests
   linux:
-    needs: set-msrv
     strategy:
       matrix:
         include:
           # 32-bit Linux/x86
-          - target: i686-unknown-linux-gnu
-            rust: ${{needs.set-msrv.outputs.msrv}}
-            deps: sudo apt update && sudo apt install gcc-multilib
           - target: i686-unknown-linux-gnu
             rust: stable
             deps: sudo apt update && sudo apt install gcc-multilib
 
           # 64-bit Linux/x86_64
-          - target: x86_64-unknown-linux-gnu
-            rust: ${{needs.set-msrv.outputs.msrv}}
           - target: x86_64-unknown-linux-gnu
             rust: stable
 
@@ -67,7 +59,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: ${{ matrix.deps }}
       - run: cargo test --target ${{ matrix.target }} --no-default-features
@@ -77,11 +69,9 @@ jobs:
 
   # macOS tests
   macos:
-    needs: set-msrv
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
           - stable
 
     runs-on: macos-latest
@@ -91,37 +81,12 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: x86_64-apple-darwin
+          targets: x86_64-apple-darwin
           override: true
       - run: cargo test --no-default-features
       - run: cargo test
       - run: cargo test --features asm
 
-  # Windows tests
-  windows:
-    needs: set-msrv
-    strategy:
-      matrix:
-        include:
-          # 64-bit Windows (GNU)
-          # TODO(tarcieri): try re-enabling this when we bump MSRV
-          #- target: x86_64-pc-windows-gnu
-          #  toolchain: 1.41.0 # MSRV
-          - target: x86_64-pc-windows-gnu
-            rust: stable
-
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: risc0/risc0/.github/actions/rustup@main
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
-      - uses: msys2/setup-msys2@v2
-      - run: cargo test --target ${{ matrix.target }}
-
   # TODO: remove on MSRV bump to 1.57 or higher
   test-msrv:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/sha3.yml b/.github/workflows/sha3.yml
@@ -19,12 +19,10 @@ env:
 
 jobs:
   build:
-    needs: set-msrv
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
           - stable
         target:
           - thumbv7em-none-eabi
@@ -35,17 +33,15 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 
   test:
-    needs: set-msrv
     runs-on: ubuntu-latest
     strategy:
       matrix:
         rust:
-          - ${{needs.set-msrv.outputs.msrv}}
           - stable
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/shabal.yml b/.github/workflows/shabal.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/sm3.yml b/.github/workflows/sm3.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/streebog.yml b/.github/workflows/streebog.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/tiger.yml b/.github/workflows/tiger.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 

diff --git a/.github/workflows/whirlpool.yml b/.github/workflows/whirlpool.yml
@@ -34,7 +34,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
           override: true
       - run: cargo build --no-default-features --target ${{ matrix.target }}