Update deps, don't require nightly for arm64

spacemeshos · Nov 28, 2023 · c6f2033 · c6f2033
1 parent 4191021
commit c6f2033
Show file tree

Hide file tree

Showing 3 changed files with 544 additions and 457 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,18 +33,14 @@ jobs:
       matrix:
         include:
           - os: [self-hosted, linux, x64, intel]
-            toolchain: stable
             runner: self-hosted-linux-intel
           - os: [self-hosted, linux, arm64]
             rustflags: --cfg=aes_armv8
-            toolchain: nightly-2023-06-27 # required for AES (https://docs.rs/aes/0.8.2/aes/#armv8-intrinsics-nightly-only)
           - os: [self-hosted, macos, arm64]
             rustflags: --cfg=aes_armv8
-            toolchain: nightly-2023-06-27 # required for AES (https://docs.rs/aes/0.8.2/aes/#armv8-intrinsics-nightly-only)
           - os: macos-latest
             toolchain: stable
           - os: windows-2019
-            toolchain: stable
 
     steps:
       - uses: arduino/setup-protoc@v2
@@ -53,9 +49,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.toolchain }}
+      - uses: dtolnay/rust-toolchain@stable
       - if: matrix.runner == 'self-hosted-linux-intel'
         run: sudo apt-get update && sudo apt-get install -y libpocl2 pocl-opencl-icd ocl-icd-opencl-dev
         name: Install dependencies for testing openCL on Linux
@@ -155,33 +149,28 @@ jobs:
             dylib: libpost.so
             staticlib: libpost.a
             artifact-name: linux
-            toolchain: stable
 
           - os: [self-hosted, linux, arm64]
             dylib: libpost.so
             staticlib: libpost.a
             rustflags: --cfg=aes_armv8
             artifact-name: linux-arm64
-            toolchain: nightly-2023-06-27 # required for AES (https://docs.rs/aes/0.8.2/aes/#armv8-intrinsics-nightly-only)
 
           - os: [self-hosted, macos, arm64]
             dylib: libpost.dylib
             staticlib: libpost.a
             rustflags: --cfg=aes_armv8
             artifact-name: macos-m1
-            toolchain: nightly-2023-06-27 # required for AES (https://docs.rs/aes/0.8.2/aes/#armv8-intrinsics-nightly-only)
 
           - os: macos-latest
             dylib: libpost.dylib
             staticlib: libpost.a
             artifact-name: macos
-            toolchain: stable
 
           - os: windows-2019
             dylib: post.dll
             staticlib: post.lib
             artifact-name: windows
-            toolchain: stable
     steps:
       - if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get install -y ocl-icd-opencl-dev
@@ -192,9 +181,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.toolchain }}
+      - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
           key: ${{ join( matrix.os, '-' ) }}