Skip to content
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

Use macOS 15 in CI #326

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Use macOS 15 in CI #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b336b6
Use macOS 15 in CI
dfed Oct 29, 2024
495386c
Update simulator names
dfed Oct 29, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
jobs:
xcode-build-16:
name: Xcode 16 Build
runs-on: macOS-14
runs-on: macOS-15
strategy:
matrix:
platforms: [
Expand All @@ -37,7 +37,7 @@ jobs:
run: Scripts/upload-coverage-reports.sh ${{ matrix.platforms }}
pod-lint:
name: Pod Lint
runs-on: macOS-14
runs-on: macOS-15
timeout-minutes: 30
steps:
- name: Checkout Repo
Expand All @@ -50,7 +50,7 @@ jobs:
run: bundle exec pod lib lint --verbose --fail-fast --swift-version=6.0
carthage:
name: Carthage
runs-on: macOS-14
runs-on: macOS-15
timeout-minutes: 30
steps:
- name: Checkout Repo
Expand All @@ -64,8 +64,8 @@ jobs:
- name: Build Framework
run: carthage build --verbose --no-skip-current --use-xcframeworks
spm-16:
name: SPM Build macOS 14
runs-on: macOS-14
name: SPM Build macOS 15
runs-on: macOS-15
strategy:
matrix:
platforms: [
Expand Down
4 changes: 2 additions & 2 deletions Scripts/build.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ enum Platform: String, CustomStringConvertible {
var destination: String {
switch self {
case .iOS_18:
"platform=iOS Simulator,OS=18.0,name=iPad Pro (12.9-inch) (6th generation)"
"platform=iOS Simulator,OS=18.0,name=iPad (10th generation)"

case .tvOS_18:
"platform=tvOS Simulator,OS=18.0,name=Apple TV"
Expand All @@ -38,7 +38,7 @@ enum Platform: String, CustomStringConvertible {
"platform=OS X"

case .watchOS_11:
"OS=11.0,name=Apple Watch Series 9 (45mm)"
"OS=11.0,name=Apple Watch Series 10 (46mm)"
}
}

Expand Down