Skip to content

Commit 826a67b

Browse files
authored
Merge pull request #732 from pabuhler/ci-update-macos-meson
ci: macOS-12 is deprecated, move to macOS-latest
2 parents bf992dc + 0417ab9 commit 826a67b

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

.github/workflows/meson.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [ubuntu-latest, macos-12, windows-latest]
16+
os: [ubuntu-latest, macos-latest, windows-latest]
1717
crypto: [internal, openssl, openssl3, wolfssl, nss, mbedtls]
1818
exclude:
1919
- os: windows-latest
@@ -55,7 +55,7 @@ jobs:
5555
sudo apt-get install meson
5656
5757
- name: Setup macOS Meson
58-
if: matrix.os == 'macos-12'
58+
if: matrix.os == 'macos-latest'
5959
run: |
6060
brew install meson
6161
@@ -88,17 +88,17 @@ jobs:
8888
run: sudo apt-get install libmbedtls-dev
8989

9090
- name: Setup macOS OpenSSL
91-
if: matrix.os == 'macos-12' && matrix.crypto == 'openssl'
91+
if: matrix.os == 'macos-latest' && matrix.crypto == 'openssl'
9292
run: echo "pkgconfig-crypto-dir=PKG_CONFIG_PATH=$(brew --prefix [email protected])/lib/pkgconfig" >> $GITHUB_ENV
9393

9494
- name: Setup macOS OpenSSL3
95-
if: matrix.os == 'macos-12' && matrix.crypto == 'openssl3'
95+
if: matrix.os == 'macos-latest' && matrix.crypto == 'openssl3'
9696
run: |
9797
brew install openssl@3
9898
echo "pkgconfig-crypto-dir=PKG_CONFIG_PATH=$(brew --prefix openssl@3)/lib/pkgconfig" >> $GITHUB_ENV
9999
100100
- name: Setup macOS wolfSSL
101-
if: matrix.os == 'macos-12' && matrix.crypto == 'wolfssl'
101+
if: matrix.os == 'macos-latest' && matrix.crypto == 'wolfssl'
102102
run: |
103103
brew install autoconf automake libtool
104104
git clone https://github.com/wolfSSL/wolfssl
@@ -116,11 +116,11 @@ jobs:
116116
cd ..
117117
118118
- name: Setup macOS NSS
119-
if: matrix.os == 'macos-12' && matrix.crypto == 'nss'
119+
if: matrix.os == 'macos-latest' && matrix.crypto == 'nss'
120120
run: brew install nss
121121

122122
- name: Setup macOS MbedTLS
123-
if: matrix.os == 'macos-12' && matrix.crypto == 'mbedtls'
123+
if: matrix.os == 'macos-latest' && matrix.crypto == 'mbedtls'
124124
run: brew install mbedtls
125125

126126
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)