From 58125eb0a517ffc647c9665021ee321f23ccc386 Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Wed, 10 Dec 2025 08:58:45 +1000 Subject: [PATCH 1/8] Update pull request workflow to use the tagged github-workflows Now that workflows is a more stable, use the most recent tag instead of main to avoid changes to default jobs preventing merging. --- .github/workflows/pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 70a224f6..e2708c51 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -17,12 +17,12 @@ 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: enable_cross_pr_testing: 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.org" api_breakage_check_allowlist_path: "api-breakages.txt" From 7e4d311306bab9389340f3cf6fac51000375011a Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Tue, 9 Dec 2025 15:14:56 -0800 Subject: [PATCH 2/8] Add Dependabot configuration for GitHub Actions (#1110) --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5ace4600 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" From ea83627d3a9217f71c562e64054bf909836dc41a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Dec 2025 23:15:30 +0000 Subject: [PATCH 3/8] Bump actions/checkout from 4 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/auto_update_version.yml | 2 +- .github/workflows/publish_release.yml | 6 +++--- .github/workflows/pull_request.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auto_update_version.yml b/.github/workflows/auto_update_version.yml index 2577047a..5299a5f5 100644 --- a/.github/workflows/auto_update_version.yml +++ b/.github/workflows/auto_update_version.yml @@ -15,7 +15,7 @@ jobs: pull-requests: write steps: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 ref: ${{ github.ref }} diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 4af70cff..1944b5ba 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -69,7 +69,7 @@ jobs: echo "Using swift-format version: $SWIFT_FORMAT_VERSION" echo "swift_format_version=$SWIFT_FORMAT_VERSION" >> "$GITHUB_OUTPUT" - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create release commits id: create_release_commits run: | @@ -129,7 +129,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Apply release commits run: | git config --global --add safe.directory "$(realpath .)" @@ -152,7 +152,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create release env: GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 79097925..3cefb63b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -36,7 +36,7 @@ jobs: image: swift:6.2 steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: persist-credentials: false - name: Mark the workspace as safe @@ -63,7 +63,7 @@ jobs: cd "$GITHUB_WORKSPACE" /tmp/check-swift-format.sh - name: Checkout swift-syntax - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: swiftlang/swift-syntax persist-credentials: false @@ -73,7 +73,7 @@ jobs: cd "$GITHUB_WORKSPACE/swift-syntax" /tmp/check-swift-format.sh - name: Checkout sourcekit-lsp - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: swiftlang/sourcekit-lsp persist-credentials: false From ebb1b5b382c71d5ac81ad5faff6ea2b3fd0f28a4 Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Thu, 11 Dec 2025 14:22:12 +1000 Subject: [PATCH 4/8] Remove Ben Barham from code owners --- CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index f5bc2420..b1e1991a 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -8,7 +8,7 @@ # See https://swift.org/CONTRIBUTORS.txt for Swift project authors # -* @allevato @bnbarham @hamishknight @rintaro +* @allevato @hamishknight @rintaro -.github/ @bnbarham @shahmishal -.swiftci/ @bnbarham @shahmishal +.github/ @shahmishal +.swiftci/ @shahmishal From 0b41fc2cd71cd77d84334aee8117ae80900b4e35 Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Fri, 12 Dec 2025 08:07:29 +1000 Subject: [PATCH 5/8] Use the tagged workflows for all workflows, not just PR testing `main` has been broken for a while and we run the same testing in the publish job as PR testing, so we haven't been able to release a nightly. Just use the tagged github-workflows for all. --- .github/workflows/automerge.yml | 2 +- .github/workflows/publish_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f548926d..f1da7ae4 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,7 +10,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: base_branch: release/6.3 permissions: diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 1944b5ba..6067557a 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -95,7 +95,7 @@ jobs: } >> "$GITHUB_OUTPUT" test: name: Test in ${{ matrix.release && 'Release' || 'Debug' }} configuration - uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main + uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@0.0.2 needs: create_release_commits strategy: fail-fast: false From df67303e372507e4ae5c57a86d6a3c10646566cd Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Fri, 12 Dec 2025 08:11:21 +1000 Subject: [PATCH 6/8] Bump the default publishing version on main to 604 release/6.3 is branched, main should now be 604 --- .github/workflows/publish_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 1944b5ba..1bb37391 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -14,13 +14,13 @@ on: required: true swift_format_version: type: string - default: 603.0.0 + default: 604.0.0 description: "swift-format version" # The version of swift-format to tag. If this is a prerelease, `-prerelease-` is added to this version. required: true swift_syntax_tag: type: string - default: 603.0.0 + default: 604.0.0 description: "swift-syntax version" # The swift-syntax version to depend on. If this is a prerelease, the latest swift-syntax prerelease tag for this version is used. required: true From 631bce549714f79a0d74a7b7640436113f3ec6cf Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Fri, 12 Dec 2025 08:19:09 +1000 Subject: [PATCH 7/8] Update allowed publishers --- .github/workflows/publish_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 1944b5ba..cf51325e 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - run: | - if [[ "${{ github.triggering_actor }}" != "bnbarham" ]]; then + if [[ "${{ github.triggering_actor }}" != "rintaro" && "${{ github.triggering_actor }}" != "hamishknight" ]]; then echo "${{ github.triggering_actor }} is not allowed to create a release" exit 1 fi From 687918d6fcf4b8f012b57eead8157c0c7f95f567 Mon Sep 17 00:00:00 2001 From: Tony Allevato Date: Mon, 15 Dec 2025 09:44:48 -0500 Subject: [PATCH 8/8] Revert "Merge pull request #1116 from bnbarham/bump-to-604" This reverts commit ac9783faff61752b5579993ec02ba1762b6154cb, reversing changes made to 400d684dd928ef7c43d4fe3ed72a412b34410208. --- .github/workflows/publish_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 5304f0d4..10440715 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -14,13 +14,13 @@ on: required: true swift_format_version: type: string - default: 604.0.0 + default: 603.0.0 description: "swift-format version" # The version of swift-format to tag. If this is a prerelease, `-prerelease-` is added to this version. required: true swift_syntax_tag: type: string - default: 604.0.0 + default: 603.0.0 description: "swift-syntax version" # The swift-syntax version to depend on. If this is a prerelease, the latest swift-syntax prerelease tag for this version is used. required: true