Skip to content

Commit bae6c4b

Browse files
authored
Merge pull request #8713 from realm/tg/gha
Update GHA workflows to work with the macOS image changes
2 parents 2be5d01 + 059e1d5 commit bae6c4b

32 files changed

+858
-1469
lines changed

.github/advanced-issue-labeler.yml

Lines changed: 0 additions & 76 deletions
This file was deleted.

.github/auto_assign.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/no-response.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/Issue-Needs-Attention.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/workflows/auto-assign.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/build-binaries.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ jobs:
1717
strategy:
1818
matrix:
1919
target: [macosx, iphoneos, iphonesimulator, appletvos, appletvsimulator, watchos, watchsimulator, maccatalyst, xros, xrsimulator]
20-
xcode: ["15.3"]
20+
env:
21+
DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
2122
steps:
2223
- uses: actions/checkout@v4
23-
24-
- name: Switch to Xcode ${{ matrix.xcode }}
25-
uses: maxim-lobanov/[email protected]
26-
with:
27-
xcode-version: ${{ matrix.xcode }}
24+
- name: Download visionOS
25+
if: matrix.target == 'xros' || matrix.target == 'xrsimulator'
26+
run: xcodebuild -downloadPlatform visionOS
2827

2928
- name: Get Core Version
3029
id: get-core-version
@@ -44,6 +43,11 @@ jobs:
4443
fetch-depth: 0
4544
fetch-tags: true
4645

46+
# CMake 3.30 introduced a check which tries to validate that the compiler
47+
# supports the requested architextures but it doesn't work.
48+
- name: Patch CMake
49+
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
50+
4751
- name: Checkout Core@${{ steps.get-core-version.outputs.version }}
4852
run: git checkout ${{ steps.get-core-version.outputs.version }} --recurse-submodules -f
4953
working-directory: core

0 commit comments

Comments
 (0)