diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 4f15934c..2aa2ebeb 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -47,12 +47,12 @@ jobs: strategy: fail-fast: false matrix: - os: ${{ fromJson(github.repository_owner == 'subspace' && '[["self-hosted", "ubuntu-20.04-x86-64"], ["self-hosted", "macos-12-arm64"], ["self-hosted", "windows-server-2022-x86-64"]]' || '["ubuntu-20.04", "macos-12", "windows-2022"]') }} + os: ${{ fromJson(github.repository_owner == 'subspace' && '[["self-hosted", "ubuntu-20.04-x86-64"], ["self-hosted", "macos-14-arm64"], ["self-hosted", "windows-server-2022-x86-64"]]' || '["ubuntu-20.04", "macos-14", "windows-2022"]') }} run-all: - ${{ inputs.test-macos-and-windows == true || github.ref == 'refs/heads/main' }} - exclude: # exclude macos-12 and windows-2022 when the condition is false + exclude: # exclude macos-14 and windows-2022 when the condition is false - run-all: false - os: macos-12 + os: macos-14 - run-all: false os: windows-2022 @@ -117,12 +117,12 @@ jobs: test: strategy: matrix: - os: ${{ fromJson(github.repository_owner == 'subspace' && '[["self-hosted", "ubuntu-20.04-x86-64"], ["self-hosted", "macos-12-arm64"], ["self-hosted", "windows-server-2022-x86-64"]]' || '["ubuntu-20.04", "macos-12", "windows-2022"]') }} + os: ${{ fromJson(github.repository_owner == 'subspace' && '[["self-hosted", "ubuntu-20.04-x86-64"], ["self-hosted", "macos-14-arm64"], ["self-hosted", "windows-server-2022-x86-64"]]' || '["ubuntu-20.04", "macos-14", "windows-2022"]') }} run-all: - ${{ inputs.test-macos-and-windows || github.ref == 'refs/heads/master' }} - exclude: # exclude macos-12 and window-2022 when the condition is false + exclude: # exclude macos-14 and window-2022 when the condition is false - run-all: false - os: macos-12 + os: macos-14 - run-all: false os: windows-2022 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b4cc48dc..be860265 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,14 +34,14 @@ jobs: # TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate bumps MSRV to # at least 1.61: https://github.com/RustCrypto/block-ciphers/issues/373 rustflags: "-C linker=aarch64-linux-gnu-gcc --cfg aes_armv8" - - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-12-arm64"]' || '"macos-12"') }} + - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-14-arm64"]' || '"macos-14"') }} target: aarch64-apple-darwin production_target: target/aarch64-apple-darwin/production suffix: macos-aarch64-${{ github.ref_name }} # TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate bumps MSRV to # at least 1.61: https://github.com/RustCrypto/block-ciphers/issues/373 rustflags: "--cfg aes_armv8" - - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-12-arm64"]' || '"macos-12"') }} + - os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-14-arm64"]' || '"macos-14"') }} target: x86_64-apple-darwin production_target: target/x86_64-apple-darwin/production suffix: macos-x86_64-${{ github.ref_name }}