Skip to content

Commit

Permalink
Merge pull request #8700 from realm/tg/update-core
Browse files Browse the repository at this point in the history
Upgrade to core 14.13.1
  • Loading branch information
tgoyne authored Oct 18, 2024
2 parents 02860d1 + 141c335 commit 2f7bd40
Show file tree
Hide file tree
Showing 7 changed files with 200 additions and 186 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@ jobs:
strategy:
matrix:
target: [macosx, iphoneos, iphonesimulator, appletvos, appletvsimulator, watchos, watchsimulator, maccatalyst, xros, xrsimulator]
xcode: ["15.3"]
env:
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
steps:
- uses: actions/checkout@v4

- name: Switch to Xcode ${{ matrix.xcode }}
uses: maxim-lobanov/[email protected]
with:
xcode-version: ${{ matrix.xcode }}
- name: Download visionOS
if: matrix.target == 'xros' || matrix.target == 'xrsimulator'
run: xcodebuild -downloadPlatform visionOS

- name: Get Core Version
id: get-core-version
Expand All @@ -44,6 +43,11 @@ jobs:
fetch-depth: 0
fetch-tags: true

# CMake 3.30 introduced a check which tries to validate that the compiler
# supports the requested architextures but it doesn't work.
- name: Patch CMake
run: sed -i '' 's/CMAKE_HOST_APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin"/CMAKE_HOST_APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT CMAKE_GENERATOR STREQUAL "Xcode"/' /opt/homebrew/Cellar/cmake/*/share/cmake/Modules/CMakeDetermineCompilerABI.cmake

- name: Checkout Core@${{ steps.get-core-version.outputs.version }}
run: git checkout ${{ steps.get-core-version.outputs.version }} --recurse-submodules -f
working-directory: core
Expand Down
Loading

0 comments on commit 2f7bd40

Please sign in to comment.