Skip to content

Commit 63e1fb0

Browse files
ni4ronaldtse
authored andcommitted
CI: Update macOS runner images labels
1 parent 710df5a commit 63e1fb0

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

‎.github/workflows/macos.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ jobs:
7070
fail-fast: false
7171
matrix:
7272
# On MacOS gcc is alias of clang these days
73-
os: [ macos-13, macos-14 ]
73+
os: [ macos-15 ]
7474
backend: [ 'botan' ]
7575
shared_libs: [ 'on' ]
7676
include:
77-
- { os: 'macos-13', backend: 'openssl@1.1', shared_libs: 'on' }
78-
- { os: 'macos-14', backend: 'openssl@3', shared_libs: 'on' }
79-
- { os: 'macos-14', backend: 'botan', shared_libs: 'off' }
80-
- { os: 'macos-14', backend: 'botan3', shared_libs: 'on' }
77+
- { os: 'macos-14', backend: 'openssl@1.1', shared_libs: 'on' }
78+
- { os: 'macos-15', backend: 'openssl@3', shared_libs: 'on' }
79+
- { os: 'macos-15-intel', backend: 'botan', shared_libs: 'off' }
80+
- { os: 'macos-26', backend: 'botan3', shared_libs: 'on' }
8181

8282
if: "!contains(github.event.head_commit.message, 'skip ci')"
8383
timeout-minutes: 250
@@ -95,7 +95,7 @@ jobs:
9595
echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl@1.1)" >> $GITHUB_ENV
9696
echo "CRYPTO_BACKEND=openssl" >> $GITHUB_ENV
9797
# Harsh workaround against CLang adding /usr/local/include path, where OpenSSL 3.0 headers are
98-
rm -r /usr/local/include/openssl
98+
rm -r /usr/local/include/openssl || true
9999
100100
- name: Configure openssl 3 backend
101101
if: matrix.backend == 'openssl@3'

0 commit comments

Comments
 (0)