From 2a6f8370172a3bbc3ad7f69fe720f325450df913 Mon Sep 17 00:00:00 2001 From: Tina Liu Date: Thu, 13 Nov 2025 14:08:49 -0800 Subject: [PATCH] Update automerger to merge from 6.3 to main Now that we have branched for 6.3, update automerger to merge from 6.3 to main. While we are not currently running automerger to merge into the release branch, update the version in `automerge_to_release.yml` as well for consistency. As part of this, we will also disable merge -> future workflow from github action. --- .github/workflows/automerge_to_main.yml | 2 +- .github/workflows/automerge_to_release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automerge_to_main.yml b/.github/workflows/automerge_to_main.yml index 342c01a49..92f62fb45 100644 --- a/.github/workflows/automerge_to_main.yml +++ b/.github/workflows/automerge_to_main.yml @@ -13,7 +13,7 @@ jobs: uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main with: base_branch: main - head_branch: release/6.2 + head_branch: release/6.3 permissions: contents: write pull-requests: write diff --git a/.github/workflows/automerge_to_release.yml b/.github/workflows/automerge_to_release.yml index 8b1503b72..8c12cb940 100644 --- a/.github/workflows/automerge_to_release.yml +++ b/.github/workflows/automerge_to_release.yml @@ -12,7 +12,7 @@ jobs: name: Create PR to merge main into release branch uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main with: - base_branch: release/6.2 + base_branch: release/6.3 permissions: contents: write pull-requests: write