diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 914d7cc7..27bf99fc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -13,10 +13,16 @@ concurrency: jobs: tests: - name: Test + name: "Test (${{ matrix.buildSystem }})" uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.4 needs: [soundness, space-format-check] + strategy: + fail-fast: false + matrix: + buildSystem: ["native", "swiftbuild"] with: + swift_flags: "--build-system ${{ matrix.buildSystem }}" + swift_nightly_flags: "--build-system ${{ matrix.buildSystem }}" linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]' linux_pre_build_command: ./.github/scripts/prebuild.sh linux_build_command: 'swift test --no-parallel' @@ -35,13 +41,20 @@ jobs: macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]" macos_pre_build_command: ./.github/scripts/prebuild.sh macos_build_command: - swift test && - /usr/bin/xcrun xcodebuild -workspace . -scheme SwiftBuild-Package -destination generic/platform=iOS + /usr/bin/xcrun xcodebuild -workspace . -scheme SwiftBuild-Package -destination generic/platform=iOS && + swift test + tests_without_docker: - name: Test without Docker + name: "Test without Docker (build system: ${{ matrix.buildSystem }})" uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.4 needs: [soundness, space-format-check] + strategy: + fail-fast: false + matrix: + buildSystem: ["native", "swiftbuild"] with: + swift_flags: "--build-system ${{ matrix.buildSystem }}" + swift_nightly_flags: "--build-system ${{ matrix.buildSystem }}" enable_linux_checks: false enable_windows_docker: false windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'