From 766004737e7347b00201f96de731ab9e57173ece Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Fri, 12 Dec 2025 08:16:22 +1000 Subject: [PATCH 1/3] Update allowed publishers (cherry picked from commit e0bbe26bcea5f7dfcf9d7e1f65f61e8041c6041d) --- .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 fd95e0caf27..e459a64cad8 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -27,7 +27,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 8e115f866695e707b5198a1d8cd3be421e101004 Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Wed, 10 Dec 2025 09:00:57 +1000 Subject: [PATCH 2/3] Update pull request workflow to use the tagged github-workflows Now that workflows is more stable, use the most recent tag instead of main to avoid changes to default jobs preventing merging. (cherry picked from commit 208b1e464a722ceacf65bf9ed18b7fbe10ef255a) --- .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 fa5a292067c..86f88a05101 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -16,12 +16,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_wasm_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: api_breakage_check_enabled: false # https://github.com/swiftlang/swift-syntax/issues/3010 docs_check_additional_arguments: "--disable-parameters-and-returns-validation" From 1c5011dd2a57f4f402f008ba5b6f32af856e2838 Mon Sep 17 00:00:00 2001 From: Ben Barham Date: Fri, 12 Dec 2025 08:03:57 +1000 Subject: [PATCH 3/3] 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. (cherry picked from commit b0e67c4837ced0bffe530f1f54f00d425c9c055a) --- .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 613ece97b95..5772c0cc4da 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.2 permissions: diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index e459a64cad8..24157594cfe 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -33,7 +33,7 @@ jobs: fi 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 strategy: fail-fast: false matrix: