Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Meson build ci fix #713

Merged
merged 2 commits into from
May 6, 2024
Merged

Meson build ci fix #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde994e
meson: remove double libsrtp dependencies
pabuhler May 6, 2024
239a986
meson: use macos-12 runners for ci builds.
pabuhler May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/meson.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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 openssl@1.1)/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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ libsrtp2_static = static_library('srtp2', sources, ciphers_sources, hashes_sourc

if default_library != 'static'
libsrtp2 = shared_library('srtp2',
dependencies: [srtp2_deps, syslibs],
soversion : soversion,
vs_module_defs: 'srtp.def',
link_whole: libsrtp2_static,
Expand Down
Loading