From 30255368fbfe80b34233ea52c8b703e7dc00fc15 Mon Sep 17 00:00:00 2001 From: Franziskus Kiefer Date: Wed, 4 Sep 2024 08:19:32 +0200 Subject: [PATCH] Update macos ci (#69) --- .github/workflows/benches.yml | 3 ++- .github/workflows/ios.yml | 4 +--- .github/workflows/rust.yml | 14 ++++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/benches.yml b/.github/workflows/benches.yml index cd9220d..0a62f7a 100644 --- 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 index 8d03d09..2da357a 100644 --- 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 index 3b479f3..2a972db 100644 --- 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: