From 53f9a749943efb3cfefcccf7f7bdd102d0345484 Mon Sep 17 00:00:00 2001
From: rxu17 <26471741+rxu17@users.noreply.github.com>
Date: Tue, 21 Jan 2025 23:48:15 -0800
Subject: [PATCH] add branch extraction for both pr and push events

---
 .github/workflows/ci.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 973b22c6..e95e7cb2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -139,15 +139,23 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - name: Extract Branch Name
+      run: |
+        if [ "$GITHUB_HEAD_REF" != "" ]; then
+          echo "BRANCH_NAME=$GITHUB_HEAD_REF" >> $GITHUB_ENV
+        else
+          echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+        fi
+        
     - name: Pull Public Docker Image from GHCR
       run: |
-        docker pull ghcr.io/sage-bionetworks/genie:${{ github.ref_name }}
+        docker pull ghcr.io/sage-bionetworks/genie:${{ env.BRANCH_NAME }}
 
     - name: Start Docker Container
       run: |
         docker run -d --name genie-container \
           -e SYNAPSE_AUTH_TOKEN="${{ secrets.SYNAPSE_AUTH_TOKEN }}" \
-          ghcr.io/sage-bionetworks/genie:${{ github.ref_name }} \
+          ghcr.io/sage-bionetworks/genie:${{ env.BRANCH_NAME }} \
           sh -c "while true; do sleep 1; done"
     
     - name: Run validation in test pipeline