From 24b368a8cc882137c054f68bf02a0d1ecedb9e5c Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Mon, 17 Nov 2025 17:38:46 -0800 Subject: [PATCH 1/2] Update automerge workflow to merge main into release --- .github/workflows/automerge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 699967f7..f15db281 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -1,7 +1,7 @@ -name: Create PR to merge release into main branch +name: Create PR to merge main into release branch # In the first period after branching the release branch, # we typically want to include many changes from `main` in the release branch. -# This workflow automatically creates a PR to merge the release branch into the main. +# This workflow automatically creates a PR to merge the main into the release branch. # Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow. # To do so, disable the workflow as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow permissions: @@ -15,8 +15,8 @@ jobs: name: Create PR to merge release into main branch uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main with: - head_branch: release/6.3 - base_branch: main + head_branch: main + base_branch: release/6.3 permissions: contents: write pull-requests: write From 5a4ca2bbb6ff48b6aa5d55f51e091ed0f4f8cbbf Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Mon, 17 Nov 2025 17:48:59 -0800 Subject: [PATCH 2/2] Update .github/workflows/automerge.yml Co-authored-by: Owen Voorhees --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index f15db281..d24b8173 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: jobs: create_merge_pr: - name: Create PR to merge release into main branch + name: Create PR to merge main into release branch uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main with: head_branch: main