From 5a52cd4f465e8281b1ae51336b7713e91142ebbb Mon Sep 17 00:00:00 2001
From: Varadarajan V <vvijayaragavan@twilio.com>
Date: Wed, 18 Oct 2023 16:47:49 +0530
Subject: [PATCH] Default Buildkite base branch and branch to update to staging

---
 .github/workflows/publish-canary.yml  | 7 ++++++-
 scripts/trigger-buildkite-pipeline.sh | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish-canary.yml b/.github/workflows/publish-canary.yml
index df0e5b33a8..3ae9475158 100644
--- a/.github/workflows/publish-canary.yml
+++ b/.github/workflows/publish-canary.yml
@@ -11,6 +11,10 @@ on:
       - add-tar-release-pipeline-1
   # Manual trigger
   workflow_dispatch:
+    inputs:
+      buildkite_branch:
+        description: 'Branch to trigger the Buildkite pipeline on'
+        default: 'staging'
 
 jobs:
   build-and-publish:
@@ -70,7 +74,8 @@ jobs:
         env:
           ACTION_DESTINATIONS_VERSION: ${{ steps.publish-packages.outputs.ACTION_DESTINATIONS_VERSION }}
           ACTIONS_CORE_VERSION: ${{ steps.publish-packages.outputs.ACTIONS_CORE_VERSION }}
-          BRANCH_NAME: ${{ github.ref_name }}
+          BRANCH_TO_UPDATE: ${{ github.ref_name }}
+          BUILDKITE_BRANCH: ci-test
           RUN_ID: ${{ github.run_id }}
           BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }}
           BUILDKITE_PIPELINE_URL: ${{ secrets.BUILDKITE_PIPELINE_URL }}
diff --git a/scripts/trigger-buildkite-pipeline.sh b/scripts/trigger-buildkite-pipeline.sh
index eadc85ff36..ac012e0572 100755
--- a/scripts/trigger-buildkite-pipeline.sh
+++ b/scripts/trigger-buildkite-pipeline.sh
@@ -3,10 +3,10 @@
 payload=$(cat <<EOF
 {  
 "commit":"HEAD",
-"branch":"ci-test", 
+"branch":"${BUILDKITE_BRANCH:-staging}",, 
 "message": ":github: Triggered from Github Actions Run: $RUN_ID",
 "env":{
-       "BRANCH_TO_UPDATE": "$BRANCH_NAME", 
+       "BRANCH_TO_UPDATE": "$BRANCH_TO_UPDATE", 
        "ACTIONS_RELEASE": "false", 
        "CREATE_PR": "false", 
        "UPGRADE_ACTION_DESTINATIONS": "true",