Fix CI cfg

RustCrypto · Jan 11, 2024 · efba397 · efba397
1 parent a9dff9c
commit efba397
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 56 deletions.
diff --git a/.github/workflows/md5.yml b/.github/workflows/md5.yml
@@ -37,6 +37,7 @@ jobs:
         target:
           - thumbv7em-none-eabi
           - wasm32-unknown-unknown
+          - loongarch64-unknown-linux-gnu
     steps:
       - uses: actions/checkout@v4
       - uses: RustCrypto/actions/cargo-cache@master
@@ -45,7 +46,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
       - uses: RustCrypto/actions/cargo-hack-install@master
-      - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std,asm
+      - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std
 
   test:
     needs: set-msrv
@@ -64,18 +65,6 @@ jobs:
       - uses: RustCrypto/actions/cargo-hack-install@master
       - run: cargo hack test --feature-powerset
 
-  # Build-only test of the LoongArch64 assembly backend
-  loongarch64_asm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: RustCrypto/actions/cargo-cache@master
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.72
-          targets: loongarch64-unknown-linux-gnu
-      - run: cargo build --target loongarch64-unknown-linux-gnu --features loongarch64_asm
-
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:

diff --git a/.github/workflows/sha1.yml b/.github/workflows/sha1.yml
@@ -35,6 +35,7 @@ jobs:
         target:
           - thumbv7em-none-eabi
           - wasm32-unknown-unknown
+          - loongarch64-unknown-linux-gnu
     steps:
       - uses: actions/checkout@v4
       - uses: RustCrypto/actions/cargo-cache@master
@@ -43,7 +44,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
       - uses: RustCrypto/actions/cargo-hack-install@master
-      - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std,asm
+      - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std
 
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
@@ -57,8 +58,6 @@ jobs:
       matrix:
         include:
           # 32-bit Linux/x86
-          # *** NOTE: Currently broken with `asm` feature enabled! See:
-          #     https://github.com/RustCrypto/hashes/issues/251
           #- target: i686-unknown-linux-gnu
           #  rust: ${{needs.set-msrv.outputs.msrv}}
           #  deps: sudo apt update && sudo apt install gcc-multilib
@@ -103,7 +102,6 @@ jobs:
           targets: x86_64-apple-darwin
       - run: cargo test --no-default-features
       - run: cargo test
-      - run: cargo test --features asm
       - run: cargo test --all-features
 
   # Windows tests
@@ -129,36 +127,18 @@ jobs:
       - uses: msys2/setup-msys2@v2
       - run: cargo test --target ${{ matrix.target }}
 
-  # Build-only test of the LoongArch64 assembly backend
-  loongarch64_asm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: RustCrypto/actions/cargo-cache@master
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.72
-          targets: loongarch64-unknown-linux-gnu
-      - run: cargo build --target loongarch64-unknown-linux-gnu --features loongarch64_asm
-
   # Cross-compiled tests
   cross:
     strategy:
       matrix:
         rust:
-          - 1.71.0
+          - 1.72.0
           - stable
         target:
           - aarch64-unknown-linux-gnu
           - powerpc-unknown-linux-gnu
         features:
           - default
-  # **** NOTE: Currently broken with `asm` feature enabled! See:
-  #      https://github.com/RustCrypto/hashes/issues/251
-  #      include:
-  #          - rust: stable
-  #            target: aarch64-unknown-linux-gnu
-  #            features: asm
 
     runs-on: ubuntu-latest
     defaults:

diff --git a/.github/workflows/sha2.yml b/.github/workflows/sha2.yml
@@ -30,11 +30,12 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.71.0
+          - ${{needs.set-msrv.outputs.msrv}}
           - stable
         target:
           - thumbv7em-none-eabi
           - wasm32-unknown-unknown
+          - loongarch64-unknown-linux-gnu
     steps:
       - uses: actions/checkout@v4
       - uses: RustCrypto/actions/cargo-cache@master
@@ -43,7 +44,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
       - uses: RustCrypto/actions/cargo-hack-install@master
-      - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std,asm-aarch64,asm
+      - run: cargo hack build --target ${{ matrix.target }} --each-feature --exclude-features default,std
 
   # Linux tests
   linux:
@@ -74,7 +75,7 @@ jobs:
           targets: ${{ matrix.target }}
       - uses: RustCrypto/actions/cargo-hack-install@master
       - run: ${{ matrix.deps }}
-      - run: cargo hack test --feature-powerset --exclude-features asm-aarch64
+      - run: cargo hack test --feature-powerset
 
   # macOS tests
   macos:
@@ -95,7 +96,6 @@ jobs:
       - uses: RustCrypto/actions/cargo-hack-install@master
       - run: cargo test --no-default-features
       - run: cargo test
-      - run: cargo test --features asm
       - run: cargo test --all-features
 
   # Windows tests
@@ -119,18 +119,6 @@ jobs:
       - uses: msys2/setup-msys2@v2
       - run: cargo test --target ${{ matrix.target }}
 
-  # Build-only test of the LoongArch64 assembly backend
-  loongarch64_asm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: RustCrypto/actions/cargo-cache@master
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: 1.72
-          targets: loongarch64-unknown-linux-gnu
-      - run: cargo build --target loongarch64-unknown-linux-gnu --features loongarch64_asm
-
   # Cross-compiled tests
   cross:
     needs: set-msrv
@@ -144,10 +132,6 @@ jobs:
           - powerpc-unknown-linux-gnu
         features:
           - default
-        include:
-            - rust: stable
-              target: aarch64-unknown-linux-gnu
-              features: asm
     runs-on: ubuntu-latest
     defaults:
       run: