From f23630cbf1e1e5dddb6aeeb65cc0ad69a9f382dd Mon Sep 17 00:00:00 2001 From: Timothy Simpson Date: Wed, 4 Mar 2026 13:40:27 +0000 Subject: [PATCH 1/2] Bump macOS runner image versions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b03ddf5..e73fb2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,8 +29,8 @@ jobs: - windows-2022 - ubuntu-24.04 - ubuntu-22.04 + - macos-15 - macos-14 - - macos-13 runs-on: ${{ matrix.runner }} From 71de8b71c6339faaf6d6f9bb3e87d754552e7fb0 Mon Sep 17 00:00:00 2001 From: Timothy Simpson Date: Wed, 4 Mar 2026 13:58:36 +0000 Subject: [PATCH 2/2] Set openssl path for macos-15 --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e73fb2e..3b1a1da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,7 +99,9 @@ jobs: echo "MPC_ROOT=$GITHUB_WORKSPACE/MPC" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/ACE_TAO/ACE/lib:$GITHUB_WORKSPACE/OpenDDS/lib" >> $GITHUB_ENV CONFIG_OPTIONS+=" --no-tests --std=c++17 --ipv6 --security" - if [ '${{ matrix.runner }}' == 'macos-14' ]; then + if [ '${{ matrix.runner }}' == 'macos-15' ]; then + CONFIG_OPTIONS+=" --xerces3=$(brew --prefix xerces-c) --openssl=/opt/homebrew/opt/openssl@1.1" + elif [ '${{ matrix.runner }}' == 'macos-14' ]; then CONFIG_OPTIONS+=" --xerces3=$(brew --prefix xerces-c) --openssl=/opt/homebrew/opt/openssl@1.1" elif [ '${{ runner.os }}' == 'macOS' ]; then CONFIG_OPTIONS+=" --xerces3=$(brew --prefix xerces-c) --openssl=/usr/local/opt/openssl@1.1"