Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
create_merge_pr:
name: Create PR to merge main into release branch
uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@0.0.1
uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@0.0.2
with:
head_branch: main
base_branch: release/6.3
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:
jobs:
tests:
name: Test
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.1
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
needs: [soundness, space-format-check]
with:
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
Expand All @@ -36,9 +36,20 @@ jobs:
macos_build_command:
swift test &&
/usr/bin/xcrun xcodebuild -workspace . -scheme SwiftBuild-Package -destination generic/platform=iOS
tests_without_docker:
name: Test without Docker
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
needs: [soundness, space-format-check]
with:
enable_linux_checks: false
enable_windows_docker: false
windows_pre_build_command: 'Invoke-Program .\.github\scripts\prebuild.ps1'
windows_swift_versions: '["nightly-main", "nightly-6.2"]'
windows_build_command: 'Invoke-Program swift test --no-parallel'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: why are we executing tests serially?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was copy-pasted from the other workflow above -- parallelism was turned off some time ago because it caused problems. We should revisit that sometime.

windows_os_versions: '["windows-2022", "windows-11-arm"]'
cmake-smoke-test:
name: cmake-smoke-test
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.1
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2
needs: [soundness, space-format-check]
with:
linux_os_versions: '["noble"]'
Expand All @@ -55,7 +66,7 @@ jobs:

soundness:
name: Soundness
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.1
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.2
with:
license_header_check_project_name: "Swift"
api_breakage_check_enabled: false
Expand Down