From dad886eae7a1d9b4a5b9e646b956a90aad45761c Mon Sep 17 00:00:00 2001 From: Jeremy Schonfeld Date: Tue, 15 Jul 2025 11:05:27 -0700 Subject: [PATCH] Update automergers for late release cycle --- .github/workflows/automerge_to_main.yml | 18 ++++++++++++++++++ ...{automerge.yml => automerge_to_release.yml} | 0 2 files changed, 18 insertions(+) create mode 100644 .github/workflows/automerge_to_main.yml rename .github/workflows/{automerge.yml => automerge_to_release.yml} (100%) diff --git a/.github/workflows/automerge_to_main.yml b/.github/workflows/automerge_to_main.yml new file mode 100644 index 000000000..ca18f8c4e --- /dev/null +++ b/.github/workflows/automerge_to_main.yml @@ -0,0 +1,18 @@ +name: Create PR to merge release branch into the main branch +# At the end of a release cycle, we may want to automatically include all changes to release branches on the main branch to avoid the need for cherry-picking changes back to release branches +# This workflow can be disabled earlier in the release cycle in the GitHub UI as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow +on: + schedule: + - cron: '0 9 * * *' + workflow_dispatch: +jobs: + create_merge_pr: + name: Create PR to merge release branch into main branch + uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main + with: + base_branch: main + head_branch: release/6.2 + permissions: + contents: write + pull-requests: write + if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-foundation') || (github.event_name != 'schedule') # Ensure that we don't run this on a schedule in a fork diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge_to_release.yml similarity index 100% rename from .github/workflows/automerge.yml rename to .github/workflows/automerge_to_release.yml