Skip to content

Commit 322f6ff

Browse files
authored
Bump macOS CI version to macOS 15 (#152)
1 parent 0cf9fb1 commit 322f6ff

File tree

4 files changed

+5
-19
lines changed

4 files changed

+5
-19
lines changed

.github/workflows/compatibility_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
os: [macos-14]
15+
os: [macos-15]
1616
xcode-version: ["16.0"]
1717
release: [2024]
1818
runs-on: ${{ matrix.os }}
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
fail-fast: false
5151
matrix:
52-
os: [macos-14]
52+
os: [macos-15]
5353
xcode-version: ["16.0"]
5454
release: [2024]
5555
ios-version: ["18.0"]

.github/workflows/ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
os: [macos-14]
15+
os: [macos-15]
1616
xcode-version: [16.0]
1717
release: [2021, 2024]
1818
ios-version: ["18.0"]

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
os: [macos-14]
15+
os: [macos-15]
1616
xcode-version: [16.0]
1717
release: [2021, 2024]
1818
runs-on: ${{ matrix.os }}

Package.swift

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,14 @@ let systemFrameworkSearchFlag = isXcodeEnv ? "-iframework" : "-Fsystem"
2626
let releaseVersion = Context.environment["OPENSWIFTUI_TARGET_RELEASE"].flatMap { Int($0) } ?? 2021
2727
let platforms: [SupportedPlatform] = switch releaseVersion {
2828
case 2024: // iOS 18.0
29-
// FIXME: non-Darwin platform nightly Swift 6 compiler have not add the latest OS yet
30-
#if canImport(Darwin)
3129
[
3230
.iOS(.v18),
33-
// FIXME: temporary lower the requirement since there is no macOS 15 CI yet.
34-
// .macOS(.v15),
35-
.macOS(.v14),
31+
.macOS(.v15),
3632
.macCatalyst(.v18),
3733
.tvOS(.v18),
3834
.watchOS(.v10),
3935
.visionOS(.v2),
4036
]
41-
#else
42-
[
43-
.iOS(.v17),
44-
.macOS(.v14),
45-
.macCatalyst(.v17),
46-
.tvOS(.v17),
47-
.watchOS(.v9),
48-
.visionOS(.v1),
49-
]
50-
#endif
5137
case 2021: // iOS 15.5
5238
[
5339
.iOS(.v15),

0 commit comments

Comments
 (0)