diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 660768f35cc..787f13b13b7 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,11 +12,12 @@ concurrency: cancel-in-progress: true jobs: - tests-using-native: + tests: needs: [soundness] strategy: fail-fast: false matrix: + executableTargetBuildSystem: ["native", "swiftbuild"] buildSystem: ["native", "swiftbuild"] linuxSwiftVersion: ['["nightly-main", "nightly-6.2"]', '["nightly-main"]'] enable_windows_checks: [true] @@ -27,24 +28,24 @@ jobs: enable_windows_checks: true - buildSystem: "native" linuxSwiftVersion: '["nightly-main"]' - name: Test (${{ matrix.buildSystem }}) + name: Test (${{ matrix.buildSystem }}) (exectable target build system ${{ matrix.executableTargetBuildSystem }}) uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.1 with: linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]' linux_swift_versions: ${{ matrix.linuxSwiftVersion }} linux_pre_build_command: ./.github/scripts/prebuild.sh - linux_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}' + linux_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}' windows_swift_versions: '["nightly-main"]' windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1' - windows_build_command: 'Invoke-Program swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}' + windows_build_command: 'Invoke-Program swift run --build-system ${{ matrix.executableTargetBuildSystem }} -Xlinker /ignore:4217 swift-test -Xlinker /ignore:4217 --parallel --build-system ${{ matrix.buildSystem}}' enable_windows_checks: ${{ matrix.enable_windows_checks }} enable_ios_checks: true enable_macos_checks: true macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.3\"}, {\"xcode_version\": \"16.4\"}]" - macos_build_command: 'swift run swift-build --build-tests --build-system ${{ matrix.buildSystem}}' + macos_build_command: 'swift run --build-system ${{ matrix.executableTargetBuildSystem }} swift-test --parallel --build-system ${{ matrix.buildSystem}}' - tests-using-swiftbuild: - name: Test (all SwiftBuild) + build-using-swiftbuild: + name: Build (all SwiftBuild) needs: [soundness] uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.1 with: