diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7187bd3..ea4416e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: m: - {os: ubuntu-22.04, dds_security: 1} - {os: ubuntu-22.04, dds_security: 0} - - {os: macos-12, dds_security: 1} - - {os: macos-12, dds_security: 0} + - {os: macos-13, dds_security: 1} + - {os: macos-13, dds_security: 0} - {os: windows-2022, dds_security: 1} - {os: windows-2022, dds_security: 0} @@ -66,7 +66,7 @@ jobs: sudo apt-get update sudo apt-get -y install libxerces-c-dev - name: 'Install xerces (macos)' - if: ${{ matrix.m.dds_security == 1 && matrix.m.os == 'macos-12' }} + if: ${{ matrix.m.dds_security == 1 && matrix.m.os == 'macos-13' }} run: | brew install xerces-c - name: Setup for run-vcpkg @@ -90,10 +90,10 @@ jobs: if: ${{ matrix.m.os == 'windows-2022' }} uses: ammaraskar/msvc-problem-matcher@0.3.0 - name: 'Set Up Problem Matcher (ubuntu / macos)' - if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-12' }} + if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-13' }} uses: ammaraskar/gcc-problem-matcher@0.3.0 - name: 'Set environment variables (ubuntu / macos)' - if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-12' }} + if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-13' }} shell: bash run: |- echo "ACE_ROOT=$GITHUB_WORKSPACE/ACE_TAO/ACE" >> $GITHUB_ENV @@ -106,7 +106,7 @@ jobs: if [ ${{ matrix.m.dds_security }} == 1 ]; then CONFIG_OPTIONS+=" --security" BUILD_TARGETS+=" OpenDDS_Security" - if [ '${{ matrix.m.os }}' == 'macos-12' ]; then + if [ '${{ matrix.m.os }}' == 'macos-13' ]; then CONFIG_OPTIONS+=" --xerces3=$(brew --prefix xerces-c) --openssl=/usr/local/opt/openssl@1.1" fi fi @@ -130,7 +130,7 @@ jobs: echo "BUILD_TARGETS=DCPSInfoRepo_Main;OpenDDS_Rtps_Udp$BUILD_TARGETS" >> $GITHUB_ENV echo "ACE_TEST_LOG_STUCK_STACKS=1" >> $GITHUB_ENV - name: 'Configure & Build OpenDDS (ubuntu / macos)' - if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-12' }} + if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-13' }} shell: bash run: |- echo "dds_security=${{ matrix.m.dds_security }}; CONFIG_OPTIONS=${{ env.CONFIG_OPTIONS }}; BUILD_TARGETS=${{ env.BUILD_TARGETS }}" @@ -155,7 +155,7 @@ jobs: call setenv.cmd msbuild -p:Configuration=Debug,Platform=x64 -t:${{ env.BUILD_TARGETS }} -m DDS_TAOv2.sln - name: 'Install (ubuntu / macos)' - if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-12' }} + if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-13' }} shell: bash run: |- npm install @@ -176,12 +176,12 @@ jobs: echo Core file pattern set to: cat /proc/sys/kernel/core_pattern - name: 'Change Cores Directory Permissions (macos)' - if: ${{ matrix.m.os == 'macos-12' }} + if: ${{ matrix.m.os == 'macos-13' }} shell: bash run: | sudo chmod o+w /cores - name: 'Test (ubuntu / macos)' - if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-12' }} + if: ${{ matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-13' }} shell: bash run: |- ulimit -c unlimited @@ -193,7 +193,7 @@ jobs: ./run_test.pl node2cpp --rtps ./run_test.pl node2node --rtps - name: 'Test Secure (ubuntu / macos)' - if: ${{ (matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-12') && matrix.m.dds_security == 1 }} + if: ${{ (matrix.m.os == 'ubuntu-22.04' || matrix.m.os == 'macos-13') && matrix.m.dds_security == 1 }} shell: bash run: |- ulimit -c unlimited