Skip to content

Commit

Permalink
Get CI running Xcode 15 (#310)
Browse files Browse the repository at this point in the history
* Get CI running Xcode 14

* Add SPM build too

* Use checkout@v4

* Get Carthage build on Xcode 15

* Use Xcode 15 and macOS-14 when possible
  • Loading branch information
dfed authored Apr 23, 2024
1 parent ac8f34b commit e1738b5
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 17 deletions.
51 changes: 37 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
Expand All @@ -48,7 +48,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
Expand All @@ -58,23 +58,24 @@ jobs:
- name: Upload Coverage Reports
if: success()
run: Scripts/upload-coverage-reports.sh ${{ matrix.platforms }}
xcode-build-14:
name: Xcode 14 Build
runs-on: macOS-13
xcode-build-15:
name: Xcode 15 Build
runs-on: macOS-14
strategy:
matrix:
platforms: [
'iOS_16,tvOS_16,watchOS_9',
'iOS_17,tvOS_17,watchOS_10',
]
fail-fast: false
timeout-minutes: 30
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
run: sudo xcode-select --switch /Applications/Xcode_14.3.app/Contents/Developer
run: sudo xcode-select --switch /Applications/Xcode_15.3.app/Contents/Developer
- name: Build and Test Framework
run: Scripts/build.swift ${{ matrix.platforms }} xcode
- name: Upload Coverage Reports
Expand All @@ -86,7 +87,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
Expand All @@ -95,15 +96,15 @@ jobs:
run: bundle exec pod lib lint --verbose --fail-fast --swift-version=5.4
carthage:
name: Carthage
runs-on: macOS-13
runs-on: macOS-14
timeout-minutes: 30
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
run: sudo xcode-select --switch /Applications/Xcode_14.3.app/Contents/Developer
run: sudo xcode-select --switch /Applications/Xcode_15.3.app/Contents/Developer
- name: Install Carthage
run: brew outdated carthage || brew upgrade carthage
- name: Build Framework
Expand All @@ -122,7 +123,7 @@ jobs:
fail-fast: false
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
Expand Down Expand Up @@ -151,7 +152,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
Expand All @@ -173,7 +174,7 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
Expand All @@ -182,3 +183,25 @@ jobs:
run: Scripts/github/prepare-simulators.sh ${{ matrix.platforms }}
- name: Build Framework
run: Scripts/build.swift ${{ matrix.platforms }} spm
spm-14:
name: SPM Build macOS 14
runs-on: macOS-14
strategy:
matrix:
platforms: [
'iOS_17,tvOS_17,watchOS_10',
'macOS_14',
]
fail-fast: false
timeout-minutes: 30
steps:
- name: Checkout Repo
uses: actions/checkout@v4
- name: Bundle Install
run: bundle install
- name: Select Xcode Version
run: sudo xcode-select --switch /Applications/Xcode_15.3.app/Contents/Developer
- name: Prepare Simulator Runtimes
run: Scripts/github/prepare-simulators.sh ${{ matrix.platforms }}
- name: Build Framework
run: Scripts/build.swift ${{ matrix.platforms }} spm
6 changes: 3 additions & 3 deletions Scripts/build.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ enum Platform: String, CustomStringConvertible {
case .iOS_16:
return "platform=iOS Simulator,OS=16.4,name=iPad Pro (12.9-inch) (6th generation)"
case .iOS_17:
return "platform=iOS Simulator,OS=17.0,name=iPad Pro (12.9-inch) (6th generation)"
return "platform=iOS Simulator,OS=17.4,name=iPad Pro (12.9-inch) (6th generation)"

case .tvOS_13:
return "platform=tvOS Simulator,OS=13.4,name=Apple TV"
Expand All @@ -63,7 +63,7 @@ enum Platform: String, CustomStringConvertible {
case .tvOS_16:
return "platform=tvOS Simulator,OS=16.4,name=Apple TV"
case .tvOS_17:
return "platform=tvOS Simulator,OS=17.0,name=Apple TV"
return "platform=tvOS Simulator,OS=17.4,name=Apple TV"

case .macOS_11,
.macOS_12,
Expand All @@ -80,7 +80,7 @@ enum Platform: String, CustomStringConvertible {
case .watchOS_9:
return "OS=9.4,name=Apple Watch Series 6 - 44mm"
case .watchOS_10:
return "OS=10.0,name=Apple Watch Series 6 - 44mm"
return "OS=10.4,name=Apple Watch Series 6 - 44mm"
}
}

Expand Down

0 comments on commit e1738b5

Please sign in to comment.