Skip to content

Commit

Permalink
Merge pull request #33 from OpenDDS/macos14-gha
Browse files Browse the repository at this point in the history
Update MacOS 12 to MacOS 14
  • Loading branch information
jrw972 authored Dec 19, 2024
2 parents 11d3090 + 7ee9968 commit 639252d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
- windows-2019
- ubuntu-22.04
- ubuntu-20.04
- macos-14
- macos-13
- macos-12

runs-on: ${{ matrix.runner }}

Expand Down Expand Up @@ -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 [ '${{ runner.os }}' == 'macOS' ]; then
if [ '${{ matrix.runner }}' == 'macos-14' ]; then
CONFIG_OPTIONS+=" --xerces3=$(brew --prefix xerces-c) --openssl=/opt/homebrew/opt/[email protected]"
elif [ '${{ runner.os }}' == 'macOS' ]; then
CONFIG_OPTIONS+=" --xerces3=$(brew --prefix xerces-c) --openssl=/usr/local/opt/[email protected]"
fi
echo "CONFIG_OPTIONS=$CONFIG_OPTIONS" >> $GITHUB_ENV
Expand Down

0 comments on commit 639252d

Please sign in to comment.