Skip to content
This repository was archived by the owner on Mar 1, 2024. It is now read-only.

Commit 389b8ef

Browse files
upgrade CI workflow to macos-14 runners (#296)
1 parent 8e19664 commit 389b8ef

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/ci-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
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"]') }}
50+
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"]') }}
5151
run-all:
5252
- ${{ inputs.test-macos-and-windows == true || github.ref == 'refs/heads/main' }}
53-
exclude: # exclude macos-12 and windows-2022 when the condition is false
53+
exclude: # exclude macos-14 and windows-2022 when the condition is false
5454
- run-all: false
55-
os: macos-12
55+
os: macos-14
5656
- run-all: false
5757
os: windows-2022
5858

@@ -117,12 +117,12 @@ jobs:
117117
test:
118118
strategy:
119119
matrix:
120-
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"]') }}
120+
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"]') }}
121121
run-all:
122122
- ${{ inputs.test-macos-and-windows || github.ref == 'refs/heads/master' }}
123-
exclude: # exclude macos-12 and window-2022 when the condition is false
123+
exclude: # exclude macos-14 and window-2022 when the condition is false
124124
- run-all: false
125-
os: macos-12
125+
os: macos-14
126126
- run-all: false
127127
os: windows-2022
128128

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
# TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate bumps MSRV to
3535
# at least 1.61: https://github.com/RustCrypto/block-ciphers/issues/373
3636
rustflags: "-C linker=aarch64-linux-gnu-gcc --cfg aes_armv8"
37-
- os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-12-arm64"]' || '"macos-12"') }}
37+
- os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-14-arm64"]' || '"macos-14"') }}
3838
target: aarch64-apple-darwin
3939
production_target: target/aarch64-apple-darwin/production
4040
suffix: macos-aarch64-${{ github.ref_name }}
4141
# TODO: AES flag is such that we have decent performance on ARMv8, remove once `aes` crate bumps MSRV to
4242
# at least 1.61: https://github.com/RustCrypto/block-ciphers/issues/373
4343
rustflags: "--cfg aes_armv8"
44-
- os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-12-arm64"]' || '"macos-12"') }}
44+
- os: ${{ fromJson(github.repository_owner == 'subspace' && '["self-hosted", "macos-14-arm64"]' || '"macos-14"') }}
4545
target: x86_64-apple-darwin
4646
production_target: target/x86_64-apple-darwin/production
4747
suffix: macos-x86_64-${{ github.ref_name }}

0 commit comments

Comments
 (0)