Skip to content

Commit 876c0e2

Browse files
committed
Update Github Actions
* Use the mbedtls@3 package on MacOS because this project is not yet compatible with MbedTLS-4.x which is now the default for Homebrew * Only set CMAKE_REQUIRE_FIND_PACKAGE_MbedTLS and FETCH_MBEDTLS when applicable
1 parent 370415a commit 876c0e2

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

.github/workflows/fedora-build.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,13 @@ jobs:
8484
run: echo "GIT_DESCRIBE=$(git describe --always --dirty)" >> $GITHUB_ENV
8585

8686
- name: Configure CMake
87-
run: cmake -B build -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=YES -DBUILD_DOCS=YES -DCPACK_COMPONENTS_GROUPING=ALL_COMPONENTS_IN_ONE
87+
run: |
88+
cmake -B build \
89+
-DCMAKE_BUILD_TYPE="RelWithDebInfo"\
90+
-DCMAKE_INSTALL_PREFIX=/usr \
91+
-DBUILD_SHARED_LIBS=YES \
92+
-DBUILD_DOCS=YES \
93+
-DCPACK_COMPONENTS_GROUPING=ALL_COMPONENTS_IN_ONE
8894
8995
- name: Build
9096
run: cmake --build build -j 4

.github/workflows/macos-build.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
# Homebrew doesn't support universal binaries so only install dependencies for arch-specific builds
2929
if: ${{ matrix.fetch_deps == 'NO' }}
3030
run: |
31-
brew install mbedtls
31+
brew install mbedtls@3
3232
brew install argp-standalone
33-
echo "CMAKE_REQUIRE_FIND_PACKAGE_MbedTLS=YES" >> $GITHUB_ENV
33+
echo "MbedTLS_DIR=$(brew --prefix mbedtls@3)/lib/cmake/MbedTLS" >> $GITHUB_ENV
3434
3535
- name: Checkout
3636
uses: actions/checkout@v4
@@ -39,7 +39,12 @@ jobs:
3939
- run: git describe --always --dirty
4040

4141
- name: Configure CMake
42-
run: cmake -B build -DCMAKE_OSX_ARCHITECTURES="${{ matrix.osx_arch }}" -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DFETCH_MBEDTLS=${{ matrix.fetch_deps }} -DCMAKE_REQUIRE_FIND_PACKAGE_MbedTLS=${{ env.CMAKE_REQUIRE_FIND_PACKAGE_MbedTLS }} -DFETCH_ARGP=${{ matrix.fetch_deps }}
42+
run: |
43+
cmake -B build \
44+
-DCMAKE_OSX_ARCHITECTURES="${{ matrix.osx_arch }}" \
45+
-DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" \
46+
${{ matrix.fetch_deps == 'NO' && '-DCMAKE_REQUIRE_FIND_PACKAGE_MbedTLS=YES' || '-DFETCH_MBEDTLS=YES' }} \
47+
-DFETCH_ARGP=${{ matrix.fetch_deps }}
4348
4449
- name: Build
4550
run: cmake --build build -j 4

.github/workflows/windows-build.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ jobs:
5252
if: ${{ matrix.fetch_deps == 'NO' }}
5353
run: |
5454
pacman --noconfirm -S --needed mingw-w64-${{matrix.env}}-mbedtls
55-
echo "CMAKE_REQUIRE_FIND_PACKAGE_MbedTLS=YES" >> $GITHUB_ENV
5655
5756
# MSYS2 Git assumes CRLF by default
5857
- name: Configure Git
@@ -61,7 +60,12 @@ jobs:
6160
git describe --always --dirty
6261
6362
- name: Configure CMake
64-
run: cmake -G Ninja -B build -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" -DBUILD_SHARED_LIBS=${{ matrix.shared_libs }} -DFETCH_MBEDTLS=${{ matrix.fetch_deps }} -DCMAKE_REQUIRE_FIND_PACKAGE_MbedTLS=${{ env.CMAKE_REQUIRE_FIND_PACKAGE_MbedTLS }} -DFETCH_ARGP=YES
63+
run: |
64+
cmake -G Ninja -B build \
65+
-DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" \
66+
-DBUILD_SHARED_LIBS=${{ matrix.shared_libs }} \
67+
${{ matrix.fetch_deps == 'NO' && '-DCMAKE_REQUIRE_FIND_PACKAGE_MbedTLS=YES' || '-DFETCH_MBEDTLS=YES' }} \
68+
-DFETCH_ARGP=YES
6569
6670
- name: Build
6771
run: cmake --build build -j 4

0 commit comments

Comments
 (0)