Skip to content

Commit bc9daf1

Browse files
committed
GHA: Enable testing
Instead of only building the tests, execute them as well. Also run against swiftbuild backend. Fixes: #9427 Issue: rdar://165491718
1 parent f43740c commit bc9daf1

File tree

1 file changed

+25
-16
lines changed

1 file changed

+25
-16
lines changed

.github/workflows/pull_request.yml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,54 +12,63 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
tests-using-native:
15+
tests:
1616
needs: [soundness]
1717
strategy:
1818
fail-fast: false
1919
matrix:
20+
executableTargetBuildSystem: ["native", "swiftbuild"]
2021
buildSystem: ["native", "swiftbuild"]
2122
linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
2223
enable_windows_checks: [true]
2324
exclude:
24-
- buildSystem: "swiftbuild"
25-
linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
26-
- buildSystem: "swiftbuild"
27-
enable_windows_checks: true
28-
- buildSystem: "native"
29-
linuxSwiftVersion: '["nightly-main"]'
30-
name: Test (${{ matrix.buildSystem }})
25+
- executableTargetBuildSystem: "swiftbuild"
26+
# - buildSystem: "swiftbuild"
27+
# linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
28+
# - buildSystem: "swiftbuild"
29+
# enable_windows_checks: true
30+
# - buildSystem: "native"
31+
# linuxSwiftVersion: '["nightly-main"]'
32+
name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
3133
uses: swiftlang/github-workflows/.github/workflows/[email protected]
3234
with:
3335
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
3436
linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
3537
linux_pre_build_command: ./.github/scripts/prebuild.sh
36-
linux_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
38+
linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
3739
windows_swift_versions: '["nightly-main"]'
3840
windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
39-
windows_build_command: 'Invoke-Program swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
41+
windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}'
4042
enable_windows_checks: ${{ matrix.enable_windows_checks }}
4143
enable_ios_checks: true
4244
enable_macos_checks: true
4345
macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
44-
macos_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
46+
macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}'
47+
ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests && swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
4548

46-
tests-using-swiftbuild:
47-
name: Test (all SwiftBuild)
49+
build-using-swiftbuild:
50+
strategy:
51+
fail-fast: false
52+
matrix:
53+
executableTargetBuildSystem: ["swiftbuild"]
54+
buildSystem: ["swiftbuild"]
55+
name: Build (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
4856
needs: [soundness]
4957
uses: swiftlang/github-workflows/.github/workflows/[email protected]
5058
with:
5159
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
5260
linux_swift_versions: '["nightly-main"]'
5361
linux_pre_build_command: ./.github/scripts/prebuild.sh
54-
linux_build_command: 'swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
62+
linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
5563
enable_windows_checks: false
5664
windows_swift_versions: '["nightly-main"]'
5765
windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
58-
windows_build_command: 'Invoke-Program swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
66+
windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
5967
enable_ios_checks: true
6068
enable_macos_checks: true
6169
macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
62-
macos_build_command: 'swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
70+
macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
71+
ios_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }} --sdk \"$(xcrun --sdk iphoneos --show-sdk-path)\" --triple arm64-apple-ios'
6372

6473
soundness:
6574
name: Soundness

0 commit comments

Comments
 (0)