From c4d432d7b39c4d0ea1544467fff8850943fb4e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coffeegoddd=E2=98=95=EF=B8=8F=E2=9C=A8?=
 <dustin@dolthub.com>
Date: Mon, 2 Mar 2026 11:20:21 -0800
Subject: [PATCH] /.github/{scripts,workflows}: allow releases from non-main
 branches

---
 .../get-dolt-profile-job-json.sh                  |  3 ++-
 .github/workflows/cd-release-pgo.yaml             | 15 ++++++++++++++-
 .github/workflows/cd-release.yaml                 |  4 ++--
 .github/workflows/k8s-dolt-profile.yaml           |  1 +
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/scripts/performance-benchmarking/get-dolt-profile-job-json.sh b/.github/scripts/performance-benchmarking/get-dolt-profile-job-json.sh
index 703668fce5..e128b35d31 100755
--- a/.github/scripts/performance-benchmarking/get-dolt-profile-job-json.sh
+++ b/.github/scripts/performance-benchmarking/get-dolt-profile-job-json.sh
@@ -60,7 +60,8 @@ echo '
               { "name": "GOEXPERIMENT", "value": "greenteagc" },
               { "name": "ACTOR", "value": "'$ACTOR'" },
               { "name": "ACTOR_EMAIL", "value": "'$ACTOR_EMAIL'" },
-              { "name": "REPO_ACCESS_TOKEN", "value": "'$REPO_ACCESS_TOKEN'" }
+              { "name": "REPO_ACCESS_TOKEN", "value": "'$REPO_ACCESS_TOKEN'" },
+              { "name": "BRANCH", "value": "'$BRANCH'" }
             ],
             "imagePullPolicy": "Always",
             "args": [
diff --git a/.github/workflows/cd-release-pgo.yaml b/.github/workflows/cd-release-pgo.yaml
index bb8987d00d..5f7325d88c 100644
--- a/.github/workflows/cd-release-pgo.yaml
+++ b/.github/workflows/cd-release-pgo.yaml
@@ -12,6 +12,13 @@ on:
       profile_key:
         description: 's3 key of dolt profile used to build pgo'
         required: true
+      branch:
+        description: 'git branch to release from'
+        required: false
+        default: 'main'
+      commit_sha:
+        description: 'exact commit SHA to build from'
+        required: false
 
   repository_dispatch:
     types: [ pgo-release ]
@@ -41,8 +48,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main
+          ref: ${{ github.event.inputs.branch || github.event.client_payload.branch || 'main' }}
           token: ${{ secrets.DOLT_RELEASE_TOKEN }}
+      - name: Pin to exact commit SHA
+        if: ${{ github.event.inputs.commit_sha || github.event.client_payload.from_version }}
+        run: git checkout -B "$BRANCH" "$SHA"
+        env:
+          BRANCH: ${{ github.event.inputs.branch || github.event.client_payload.branch || 'main' }}
+          SHA: ${{ github.event.inputs.commit_sha || github.event.client_payload.from_version }}
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
         with:
diff --git a/.github/workflows/cd-release.yaml b/.github/workflows/cd-release.yaml
index 18596723b2..6716aba2a0 100644
--- a/.github/workflows/cd-release.yaml
+++ b/.github/workflows/cd-release.yaml
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main
+          ref: ${{ github.ref_name }}
       - name: Get sha
         id: get_sha
         run: |
@@ -40,4 +40,4 @@ jobs:
         with:
           token: ${{ secrets.REPO_ACCESS_TOKEN }}
           event-type: profile-dolt
-          client-payload: '{"from_version": "${{ steps.get_sha.outputs.sha }}", "future_version": "${{ needs.format-version.outputs.version }}", "mode": "release", "actor": "${{ github.actor }}", "actor_email": "dustin@dolthub.com", "template_script": "./.github/scripts/performance-benchmarking/get-dolt-profile-job-json.sh"}'
+          client-payload: '{"from_version": "${{ steps.get_sha.outputs.sha }}", "future_version": "${{ needs.format-version.outputs.version }}", "mode": "release", "actor": "${{ github.actor }}", "actor_email": "dustin@dolthub.com", "template_script": "./.github/scripts/performance-benchmarking/get-dolt-profile-job-json.sh", "branch": "${{ github.ref_name }}"}'
diff --git a/.github/workflows/k8s-dolt-profile.yaml b/.github/workflows/k8s-dolt-profile.yaml
index 94db7f30c1..d9aad5d392 100644
--- a/.github/workflows/k8s-dolt-profile.yaml
+++ b/.github/workflows/k8s-dolt-profile.yaml
@@ -48,3 +48,4 @@ jobs:
           INIT_BIG_REPO: ${{ github.event.client_payload.init_big_repo }}
           NOMS_BIN_FORMAT: "__DOLT__"
           TEMPLATE_SCRIPT: ${{ github.event.client_payload.template_script }}
+          BRANCH: ${{ github.event.client_payload.branch || 'main' }}