Skip to content

Commit a24975f

Browse files
committed
pipeline: Include steps to test using SwiftBuild build system
1 parent 3a9a8f6 commit a24975f

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

.github/workflows/pull_request.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,37 @@ concurrency:
1313

1414
jobs:
1515
tests:
16-
name: Test
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
buildSystem: ["native", "swiftbuild"]
20+
linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]']
21+
exclude:
22+
- buildSystem: "swiftbuild"
23+
linuxSwiftVersion: '["nightly-main", "nightly-6.2"]'
24+
- buildSystem: "native"
25+
linuxSwiftVersion: '["nightly-main"]'
26+
name: Test (${{ matrix.buildSystem }})
1727
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
1828
with:
1929
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
2030
linux_pre_build_command: ./.github/scripts/prebuild.sh
21-
linux_build_command: 'swift test --no-parallel'
22-
linux_swift_versions: '["nightly-main", "nightly-6.2"]'
31+
linux_build_command: 'swift test --no-parallel --build-system ${{ matrix.buildSystem }}'
32+
linux_swift_versions: ${{ matrix.linuxSwiftVersion }}
2333
windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
2434
windows_swift_versions: '["nightly-main"]'
25-
windows_build_command: 'Invoke-Program swift test --no-parallel'
35+
windows_build_command: 'Invoke-Program swift test --no-parallel --build-system ${{ matrix.buildSystem }}'
2636
enable_linux_static_sdk_build: true
2737
enable_android_sdk_build: true
28-
android_sdk_build_command: "swift build --build-tests"
38+
android_sdk_build_command: "swift build --build-tests --build-system ${{ matrix.buildSystem }}"
2939
android_ndk_versions: '["r27d", "r29"]'
30-
linux_static_sdk_build_command: SWIFTBUILD_STATIC_LINK=1 LLBUILD_STATIC_LINK=1 swift build
40+
linux_static_sdk_build_command: SWIFTBUILD_STATIC_LINK=1 LLBUILD_STATIC_LINK=1 swift build --build-system ${{ matrix.buildSystem }}
3141
enable_ios_checks: true
3242
enable_macos_checks: true
3343
macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]"
3444
macos_pre_build_command: ./.github/scripts/prebuild.sh
3545
macos_build_command:
36-
swift test &&
46+
swift test --build-system ${{ matrix.buildSystem }} &&
3747
/usr/bin/xcrun xcodebuild -workspace . -scheme SwiftBuild-Package -destination generic/platform=iOS
3848
cmake-smoke-test:
3949
name: cmake-smoke-test

0 commit comments

Comments
 (0)