Merge branch 'main' into update-kem-algos

cryspen · Sep 4, 2024 · dd0e4dd · dd0e4dd
2 parents c32fd7e + 3025536
commit dd0e4dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/benches.yml b/.github/workflows/benches.yml
@@ -16,7 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-11
+          - macos-13
+          - macos-latest
           - ubuntu-latest
           - windows-latest
 

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -12,14 +12,12 @@ env:
 
 jobs:
   build:
-    runs-on: macos-11
+    runs-on: macos-13
 
     steps:
     - uses: actions/checkout@v2
     - name: Setup MacOS
       run: |
-        sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
-        sudo xcode-select -s /Applications/Xcode_12.4.app
         rustup target install aarch64-apple-darwin
         rustup target install aarch64-apple-ios
     - name: Apple Silicon Build

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -16,7 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-11
+          - macos-13
+          - macos-latest
           - ubuntu-latest
           - windows-latest
 
@@ -41,23 +42,20 @@ jobs:
       working-directory: rust_crypto_provider
       run: cargo build --verbose --all-features
     # Apple Silicon
-    - if: matrix.os == 'macos-11'
+    - if: matrix.os == 'macos-13'
       run: |
-        brew install pkg-config
-        sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
-        sudo xcode-select -s /Applications/Xcode_12.4.app
         rustup target install aarch64-apple-darwin
         rustup target install aarch64-apple-ios
     - name: Build
       run: cargo build --verbose
     - name: Apple Silicon Build
-      if: matrix.os == 'macos-11'
+      if: matrix.os == 'macos-13'
       run: |
         cargo build --target aarch64-apple-darwin --tests --verbose
         cargo build --release --target aarch64-apple-darwin --tests --verbose
     # ARM64 iOS
     - name: iOS aarch64
-      if: matrix.os == 'macos-11'
+      if: matrix.os == 'macos-13'
       run: |
         cargo build --target aarch64-apple-ios --tests --verbose
         cargo build --release --target aarch64-apple-ios --tests --verbose
@@ -96,7 +94,7 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-11
+          - macos-13
           - ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps: