Skip to content

Commit d8dd951

Browse files
committed
adjust pull-request workflow
1 parent 2ae0c65 commit d8dd951

File tree

1 file changed

+28
-16
lines changed

1 file changed

+28
-16
lines changed

.github/workflows/pull_request.yml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,39 @@ jobs:
99
name: Test
1010
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
1111
with:
12+
swift_flags: "-Xbuild-tools-swiftc -DSYSTEM_CI"
13+
enable_linux_checks: true
1214
linux_os_versions: '["noble", "jammy", "focal"]'
13-
linux_exclude_swift_versions: '[{"os_version": "focal", "swift_version": "nightly-main"}, {"os_version": "focal", "swift_version": "nightly-6.2"}, {"os_version": "focal", "swift_version": "6.2"}, {"os_version": "noble", "swift_version": "5.9"}, {"os_version": "noble", "swift_version": "5.10"}]'
15+
linux_exclude_swift_versions: |
16+
[
17+
{"swift_version": "5.9"},
18+
{"swift_version": "5.10"},
19+
{"os_version": "focal", "swift_version": "nightly-6.2"},
20+
{"os_version": "focal", "swift_version": "6.2"},
21+
{"os_version": "focal", "swift_version": "nightly-main"},
22+
]
1423
enable_macos_checks: true
15-
# FIXME: https://github.com/swiftlang/github-workflows/pull/140
16-
# Xcode 16.0 and 16.1 are not actually available
17-
macos_exclude_xcode_versions: |
24+
macos_exclude_xcode_versions: '[]'
25+
enable_windows_checks: true
26+
windows_exclude_swift_versions: |
1827
[
19-
{"xcode_version": "16.0"},
20-
{"xcode_version": "16.1"},
28+
{"swift_version": "5.9"},
29+
{"swift_version": "5.10"}
2130
]
22-
swift_flags: "-Xbuild-tools-swiftc -DSYSTEM_CI"
2331
enable_linux_static_sdk_build: true
24-
linux_static_sdk_exclude_swift_versions: '[{"os_version": "focal", "swift_version": "nightly-main"}, {"os_version": "focal", "swift_version": "nightly-6.2"}, {"os_version": "focal", "swift_version": "6.2"}]'
32+
linux_static_sdk_exclude_swift_versions: |
33+
[
34+
{"os_version": "focal", "swift_version": "nightly-6.2"},
35+
{"os_version": "focal", "swift_version": "6.2"},
36+
{"os_version": "focal", "swift_version": "nightly-main"},
37+
]
2538
enable_wasm_sdk_build: true
26-
wasm_exclude_swift_versions: '[{"os_version": "focal", "swift_version": "nightly-main"}, {"os_version": "focal", "swift_version": "nightly-6.2"}, {"os_version": "focal", "swift_version": "6.2"}]'
39+
wasm_exclude_swift_versions: |
40+
[
41+
{"os_version": "focal", "swift_version": "nightly-6.2"},
42+
{"os_version": "focal", "swift_version": "6.2"},
43+
{"os_version": "focal", "swift_version": "nightly-main"},
44+
]
2745
2846
build-abi-stable:
2947
name: Build ABI Stable
@@ -34,13 +52,7 @@ jobs:
3452
enable_windows_checks: false
3553
# Only build
3654
macos_build_command: "xcrun swift build --build-tests"
37-
# FIXME: https://github.com/swiftlang/github-workflows/pull/140
38-
# Xcode 16.0 and 16.1 are not actually available
39-
macos_exclude_xcode_versions: |
40-
[
41-
{"xcode_version": "16.0"},
42-
{"xcode_version": "16.1"},
43-
]
55+
macos_exclude_xcode_versions: '[]'
4456
# Enable availability to match ABI stable verion of system.
4557
swift_flags: "-Xbuild-tools-swiftc -DSYSTEM_CI -Xbuild-tools-swiftc -DSYSTEM_ABI_STABLE"
4658

0 commit comments

Comments
 (0)