Skip to content

Commit

Permalink
Fix CI (#307)
Browse files Browse the repository at this point in the history
* Fix CI

GitHub has quietly removed Xcode 16 support from its macOS 14 images so
we need to split it out.

* fix?
  • Loading branch information
stephencelis authored Nov 13, 2024
1 parent 28f8271 commit d7a3304
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 6 deletions.
26 changes: 23 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,33 @@ concurrency:
cancel-in-progress: true

jobs:
macos:
name: macOS
macos-15:
name: macOS 15
runs-on: macos-15
strategy:
matrix:
config: ['debug', 'release']
xcode: ['16.0']
steps:
- uses: actions/checkout@v4
- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
- name: Skip macro validation
run: defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
- name: Run tests
run: make test-swift
- name: Build platforms ${{ matrix.config }}
run: CONFIG=${{ matrix.config }} make build-all-platforms
- name: Build for library evolution
run: make build-for-library-evolution

macos-14:
name: macOS 14
runs-on: macos-14
strategy:
matrix:
config: ['debug', 'release']
xcode: ['15.4', '16.0']
xcode: ['15.4']
steps:
- uses: actions/checkout@v4
- name: Select Xcode ${{ matrix.xcode }}
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CONFIG = debug
PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17,iPhone \d\+ Pro [^M])
PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS,iPhone \d\+ Pro [^M])
PLATFORM_MACOS = macOS
PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,tvOS 17,TV)
PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS 10,Watch)
PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,tvOS,TV)
PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS,Watch)

default: test

Expand Down

0 comments on commit d7a3304

Please sign in to comment.