From be735e36c45daf6f0f52ef8187e9574c9aaa81cd Mon Sep 17 00:00:00 2001
From: Warren Gifford <warren@sourcegraph.com>
Date: Tue, 20 Oct 2026 21:29:35 +0000
Subject: [PATCH] release: Hand "Update main" PRs over to the releaseworker

The releaseworker now opens the "Update main" PR itself, with auto-merge
enabled and Platform requested as reviewers, so promote finalize no longer
creates it.

The Buildkite promote release steps now skip promote/release-*-update-main
branches. Those branches carry no serialized release config, so
"(promote) Release: test" failed on every one of them.

Amp-Thread-ID: https://ampcode.com/threads/T-01a15b02-d007-70c8-94ff-02a631709466
---
 .buildkite/pipeline.yaml |  4 ++--
 release.yaml             | 36 ------------------------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 852b496b9..2dbb8cc15 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -41,7 +41,7 @@ steps:
       sg release run test --workdir=. --config-from-commit
 
   - label: "(promote) Release: test"
-    if: build.branch =~ /^promote\/release-.*/
+    if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/
     plugins:
       - ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~
     command: |
@@ -58,7 +58,7 @@ steps:
 
 
   - label: "(promote) Release: finalize"
-    if: build.branch =~ /^promote\/release-.*/
+    if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/
     plugins:
       - ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~
     command: |
diff --git a/release.yaml b/release.yaml
index b043fe076..544879460 100644
--- a/release.yaml
+++ b/release.yaml
@@ -224,39 +224,3 @@ promoteToPublic:
           cat << EOF | buildkite-agent annotate --style info
           Promoted release is **publicly available** through a git tag at [\`{{version}}\`](https://github.com/sourcegraph/deploy-sourcegraph-docker/tree/{{version}}).
           EOF
-
-      - name: "update main with latest version"
-      - name: "git"
-        cmd: |
-          set -eu
-          branch="promote/release-{{version}}-update-main"
-          echo "Checking out origin/main"
-          git fetch origin main
-          git switch main
-          echo "Creating branch origin/${branch}"
-          git switch -c "${branch}"
-
-      - name: docker(compose):tags
-        cmd: |
-          set -eu
-          registry=index.docker.io/sourcegraph
-          sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/
-
-      - name: "git:branch"
-        cmd: |
-          set -eu
-          branch="promote/release-{{version}}-update-main"
-          git commit -am 'prep update main: {{version}}' -m 'update main with latest release'
-          git push origin "${branch}"
-
-      - name: "github:pr"
-        cmd: |
-          set -eu
-          # Create PR to merge release updates into main branch
-          gh pr create \
-            --fill \
-            --draft \
-            --base main \
-            --title "Update main: build {{version}}" \
-            --body "Test plan: automated release PR, CI will perform additional checks"
-          echo "🚢 Please check the associated CI build to ensure the process completed".