From e4b7460d850c7042d00cbe41ed5eeec3736adedf Mon Sep 17 00:00:00 2001 From: Stuart Montgomery Date: Tue, 9 Dec 2025 22:00:41 -0600 Subject: [PATCH 1/3] Switch CI workflows using 6.2 to 6.3 and pin workflows to a specific tag --- .github/workflows/automerge.yml | 2 +- .github/workflows/main_using_main.yml | 2 +- .github/workflows/main_using_release.yml | 8 ++++---- .github/workflows/pull_request.yml | 8 ++++---- README.md | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index b9ac3ab08..4069162ed 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -18,7 +18,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@main + uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@0.0.2 with: head_branch: main base_branch: release/6.3 diff --git a/.github/workflows/main_using_main.yml b/.github/workflows/main_using_main.yml index dbf27c0f4..2b7c9ac16 100644 --- a/.github/workflows/main_using_main.yml +++ b/.github/workflows/main_using_main.yml @@ -15,7 +15,7 @@ concurrency: jobs: tests: name: Test - uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main + uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2 with: linux_swift_versions: '["nightly-main"]' linux_os_versions: '["amazonlinux2", "jammy"]' diff --git a/.github/workflows/main_using_release.yml b/.github/workflows/main_using_release.yml index b861be1f8..1a2e2b6f0 100644 --- a/.github/workflows/main_using_release.yml +++ b/.github/workflows/main_using_release.yml @@ -1,4 +1,4 @@ -name: main branch, 6.2 toolchain +name: main branch, 6.3 toolchain permissions: contents: read @@ -15,11 +15,11 @@ concurrency: jobs: tests: name: Test - uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main + uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2 with: - linux_swift_versions: '["nightly-6.2"]' + linux_swift_versions: '["nightly-6.3"]' linux_os_versions: '["amazonlinux2", "jammy"]' - windows_swift_versions: '["nightly-6.2"]' + windows_swift_versions: '["nightly-6.3"]' enable_macos_checks: true macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]' enable_wasm_sdk_build: true diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 086b2226e..765114d1c 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -14,11 +14,11 @@ concurrency: jobs: tests: name: Test - uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main + uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2 with: - linux_swift_versions: '["nightly-main", "nightly-6.2"]' + linux_swift_versions: '["nightly-main", "nightly-6.3"]' linux_os_versions: '["amazonlinux2", "jammy"]' - windows_swift_versions: '["nightly-main", "nightly-6.2"]' + windows_swift_versions: '["nightly-main", "nightly-6.3"]' enable_macos_checks: true macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]' enable_ios_checks: true @@ -27,7 +27,7 @@ jobs: enable_android_sdk_build: true soundness: name: Soundness - uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main + uses: swiftlang/github-workflows/.github/workflows/soundness.yml@0.0.2 with: license_header_check_project_name: "Swift" docs_check_enabled: false diff --git a/README.md b/README.md index 3f9711fa4..c20676743 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Swift Testing is a package with expressive and intuitive APIs that make testing your Swift code a breeze. [![CI status badge for main branch using main toolchain](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_main.yml/badge.svg?branch=main&event=push)](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_main.yml) -[![CI status badge for main branch using 6.2 toolchain](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_release.yml/badge.svg?branch=main&event=push)](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_release.yml) +[![CI status badge for main branch using 6.3 toolchain](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_release.yml/badge.svg?branch=main&event=push)](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_release.yml) ## Feature overview From 4e0f4d181e3c5b9fd51f2911b3de94e1c5499f02 Mon Sep 17 00:00:00 2001 From: Stuart Montgomery Date: Tue, 9 Dec 2025 22:42:18 -0600 Subject: [PATCH 2/3] Keep using 6.2 (but switch to non-nightly) for main-with-release workflow, and add (rather than replace) 6.2 alongside nightly-6.3 --- .github/workflows/main_using_release.yml | 6 +++--- .github/workflows/pull_request.yml | 4 ++-- README.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main_using_release.yml b/.github/workflows/main_using_release.yml index 1a2e2b6f0..ca61550b1 100644 --- a/.github/workflows/main_using_release.yml +++ b/.github/workflows/main_using_release.yml @@ -1,4 +1,4 @@ -name: main branch, 6.3 toolchain +name: main branch, 6.2 toolchain permissions: contents: read @@ -17,9 +17,9 @@ jobs: name: Test uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2 with: - linux_swift_versions: '["nightly-6.3"]' + linux_swift_versions: '["6.2"]' linux_os_versions: '["amazonlinux2", "jammy"]' - windows_swift_versions: '["nightly-6.3"]' + windows_swift_versions: '["6.2"]' enable_macos_checks: true macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]' enable_wasm_sdk_build: true diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 765114d1c..6cd006897 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -16,9 +16,9 @@ jobs: name: Test uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2 with: - linux_swift_versions: '["nightly-main", "nightly-6.3"]' + linux_swift_versions: '["nightly-main", "nightly-6.3", "6.2"]' linux_os_versions: '["amazonlinux2", "jammy"]' - windows_swift_versions: '["nightly-main", "nightly-6.3"]' + windows_swift_versions: '["nightly-main", "nightly-6.3", "6.2"]' enable_macos_checks: true macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]' enable_ios_checks: true diff --git a/README.md b/README.md index c20676743..3f9711fa4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Swift Testing is a package with expressive and intuitive APIs that make testing your Swift code a breeze. [![CI status badge for main branch using main toolchain](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_main.yml/badge.svg?branch=main&event=push)](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_main.yml) -[![CI status badge for main branch using 6.3 toolchain](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_release.yml/badge.svg?branch=main&event=push)](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_release.yml) +[![CI status badge for main branch using 6.2 toolchain](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_release.yml/badge.svg?branch=main&event=push)](https://github.com/swiftlang/swift-testing/actions/workflows/main_using_release.yml) ## Feature overview From 89099a6350ea7e6e3c1aa9e68cd71725c92496db Mon Sep 17 00:00:00 2001 From: Stuart Montgomery Date: Wed, 10 Dec 2025 09:26:37 -0600 Subject: [PATCH 3/3] Switch from 6.2 back to nightly-6.2 --- .github/workflows/main_using_release.yml | 4 ++-- .github/workflows/pull_request.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main_using_release.yml b/.github/workflows/main_using_release.yml index ca61550b1..ef6742d82 100644 --- a/.github/workflows/main_using_release.yml +++ b/.github/workflows/main_using_release.yml @@ -17,9 +17,9 @@ jobs: name: Test uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2 with: - linux_swift_versions: '["6.2"]' + linux_swift_versions: '["nightly-6.2"]' linux_os_versions: '["amazonlinux2", "jammy"]' - windows_swift_versions: '["6.2"]' + windows_swift_versions: '["nightly-6.2"]' enable_macos_checks: true macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]' enable_wasm_sdk_build: true diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 6cd006897..bef278cbb 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -16,9 +16,9 @@ jobs: name: Test uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2 with: - linux_swift_versions: '["nightly-main", "nightly-6.3", "6.2"]' + linux_swift_versions: '["nightly-main", "nightly-6.3", "nightly-6.2"]' linux_os_versions: '["amazonlinux2", "jammy"]' - windows_swift_versions: '["nightly-main", "nightly-6.3", "6.2"]' + windows_swift_versions: '["nightly-main", "nightly-6.3", "nightly-6.2"]' enable_macos_checks: true macos_exclude_xcode_versions: '[{"xcode_version": "16.2"}, {"xcode_version": "16.3"}, {"xcode_version": "16.4"}]' enable_ios_checks: true