Skip to content

Build the macOS natives on macos-15 #214

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

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

Build the macOS natives on macos-15 #214

Show file tree
Hide file tree
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
6 changes: 2 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- run: mvn -P "${{ matrix.profile }}" --batch-mode

macos:
runs-on: [macos-14]
runs-on: [macos-15]
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -81,10 +81,8 @@ jobs:
- name: Set SDK version
run: |
export MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos-deployment-target }}
export SDKROOT=$XCODE_16_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/${{ matrix.sdk-version }}
export CMAKE_OSX_SYSROOT=$SDKROOT
export CMAKE_OSX_SYSROOT=$XCODE_16_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/${{ matrix.sdk-version }}
echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" >> $GITHUB_ENV
echo "SDKROOT=$SDKROOT" >> $GITHUB_ENV
echo "CMAKE_OSX_SYSROOT=$CMAKE_OSX_SYSROOT" >> $GITHUB_ENV

- run: mvn -P "${{ matrix.profile }}" --batch-mode
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/cross-compile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
while git pull --rebase && ! git push; do sleep 5; done

macos:
runs-on: macos-14
runs-on: macos-15
needs: create-branch
strategy:
matrix:
Expand Down Expand Up @@ -170,10 +170,8 @@ jobs:
- name: Set SDK version
run: |
export MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos-deployment-target }}
export SDKROOT=$XCODE_16_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/${{ matrix.sdk-version }}
export CMAKE_OSX_SYSROOT=$SDKROOT
export CMAKE_OSX_SYSROOT=$XCODE_16_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/${{ matrix.sdk-version }}
echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" >> $GITHUB_ENV
echo "SDKROOT=$SDKROOT" >> $GITHUB_ENV
echo "CMAKE_OSX_SYSROOT=$CMAKE_OSX_SYSROOT" >> $GITHUB_ENV
- name: Build with Maven
run: |
Expand Down
9 changes: 8 additions & 1 deletion ant/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,15 @@
<equals arg1="${os.target.arch}" arg2="arm_32"/>
</condition>

<!-- SDK from env CMAKE_OSX_SYSROOT, if set. Not SDKROOT: the xcrun shims (make, c++) read it too,
and newer Xcodes cannot resolve old SDKs -->
<property environment="env"/>
<condition property="xcode.sysroot.arg" value="-DCMAKE_OSX_SYSROOT=&quot;${env.CMAKE_OSX_SYSROOT}&quot;" else="">
<isset property="env.CMAKE_OSX_SYSROOT"/>
</condition>

<!-- Set cmake property "CMAKE_OSX_ARCHITECTURES" -->
<property name="cmake.generator.arg" value="-DCMAKE_OSX_ARCHITECTURES=${xcode.arch}"/>
<property name="cmake.generator.arg" value="-DCMAKE_OSX_ARCHITECTURES=${xcode.arch} ${xcode.sysroot.arg}"/>
</target>

<target name="gcc-props" if="use.gcc">
Expand Down
Loading