-
Notifications
You must be signed in to change notification settings - Fork 477
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #713 from pabuhler/meson-build-ci
Meson build ci fix
- Loading branch information
Showing
2 changed files
with
7 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [ubuntu-latest, macos-latest, windows-latest] | ||
os: [ubuntu-latest, macos-12, windows-latest] | ||
crypto: [internal, openssl, openssl3, wolfssl, nss, mbedtls] | ||
exclude: | ||
- os: windows-latest | ||
|
@@ -55,7 +55,7 @@ jobs: | |
sudo apt-get install meson | ||
- name: Setup macOS Meson | ||
if: matrix.os == 'macos-latest' | ||
if: matrix.os == 'macos-12' | ||
run: | | ||
brew install meson | ||
|
@@ -88,17 +88,17 @@ jobs: | |
run: sudo apt-get install libmbedtls-dev | ||
|
||
- name: Setup macOS OpenSSL | ||
if: matrix.os == 'macos-latest' && matrix.crypto == 'openssl' | ||
if: matrix.os == 'macos-12' && matrix.crypto == 'openssl' | ||
run: echo "pkgconfig-crypto-dir=PKG_CONFIG_PATH=$(brew --prefix [email protected])/lib/pkgconfig" >> $GITHUB_ENV | ||
|
||
- name: Setup macOS OpenSSL3 | ||
if: matrix.os == 'macos-latest' && matrix.crypto == 'openssl3' | ||
if: matrix.os == 'macos-12' && matrix.crypto == 'openssl3' | ||
run: | | ||
brew install openssl@3 | ||
echo "pkgconfig-crypto-dir=PKG_CONFIG_PATH=$(brew --prefix openssl@3)/lib/pkgconfig" >> $GITHUB_ENV | ||
- name: Setup macOS wolfSSL | ||
if: matrix.os == 'macos-latest' && matrix.crypto == 'wolfssl' | ||
if: matrix.os == 'macos-12' && matrix.crypto == 'wolfssl' | ||
run: | | ||
brew install autoconf automake libtool | ||
git clone https://github.com/wolfSSL/wolfssl | ||
|
@@ -116,11 +116,11 @@ jobs: | |
cd .. | ||
- name: Setup macOS NSS | ||
if: matrix.os == 'macos-latest' && matrix.crypto == 'nss' | ||
if: matrix.os == 'macos-12' && matrix.crypto == 'nss' | ||
run: brew install nss | ||
|
||
- name: Setup macOS MbedTLS | ||
if: matrix.os == 'macos-latest' && matrix.crypto == 'mbedtls' | ||
if: matrix.os == 'macos-12' && matrix.crypto == 'mbedtls' | ||
run: brew install mbedtls | ||
|
||
- uses: actions/checkout@v2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters