Skip to content

Commit 0472150

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 52f7c41 commit 0472150

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

.github/workflows/pull_request.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ 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"]
2021
buildSystem: ["native", "swiftbuild"]
2122
linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
2223
enable_windows_checks: [true]
@@ -27,39 +28,46 @@ jobs:
2728
enable_windows_checks: true
2829
- buildSystem: "native"
2930
linuxSwiftVersion: '["nightly-main"]'
30-
name: Test (${{ matrix.buildSystem }})
31+
name: Test (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
3132
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
3233
with:
3334
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
3435
linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
3536
linux_pre_build_command: ./.github/scripts/prebuild.sh
36-
linux_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}'
37+
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}}'
3738
windows_swift_versions: '["nightly-main"]'
3839
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}}'
40+
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}}'
4041
enable_windows_checks: ${{ matrix.enable_windows_checks }}
4142
enable_ios_checks: true
4243
enable_macos_checks: true
4344
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}}'
45+
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}}'
46+
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'
4547

46-
tests-using-swiftbuild:
47-
name: Test (all SwiftBuild)
48+
build-using-swiftbuild:
49+
strategy:
50+
fail-fast: false
51+
matrix:
52+
executableTargetBuildSystem: ["swiftbuild"]
53+
buildSystem: ["swiftbuild"]
54+
name: Build (${{ matrix.buildSystem }}) (exectable target built using ${{ matrix.executableTargetBuildSystem }})
4855
needs: [soundness]
4956
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
5057
with:
5158
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
5259
linux_swift_versions: '["nightly-main"]'
5360
linux_pre_build_command: ./.github/scripts/prebuild.sh
54-
linux_build_command: 'swift run --build-system swiftbuild swift-build --build-tests --build-system swiftbuild'
61+
linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
5562
enable_windows_checks: false
5663
windows_swift_versions: '["nightly-main"]'
5764
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'
65+
windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
5966
enable_ios_checks: true
6067
enable_macos_checks: true
6168
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'
69+
macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-build --build-tests --build-system ${{ matrix.buildSystem }}'
70+
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'
6371

6472
soundness:
6573
name: Soundness
@@ -71,3 +79,7 @@ jobs:
7179
api_breakage_check_enabled: false
7280
format_check_enabled: false
7381
shell_check_enabled: false
82+
docs_check_enabled: true
83+
broken_symlink_check_enabled: true
84+
python_lint_check_enabled: true
85+
yamllint_check_enabled: true

Utilities/build-using-self

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def main() -> None:
301301
*args.additional_run_args.split(" "),
302302
"swift-test",
303303
*global_args,
304-
"--vv",
304+
# "--vv",
305305
"--force-resolved-versions",
306306
"--parallel",
307307
"--scratch-path",

0 commit comments

Comments
 (0)