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

Update MacOS 12 to MacOS 13 #75

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update MacOS 12 to MacOS 13 #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down Expand Up @@ -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
Expand All @@ -90,10 +90,10 @@ jobs:
if: ${{ matrix.m.os == 'windows-2022' }}
uses: ammaraskar/[email protected]
- 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/[email protected]
- 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
Expand All @@ -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/[email protected]"
fi
fi
Expand All @@ -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 }}"
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading