[GitHub] FIX GIT_BRANCH

Author: guparan

.github/workflows/macos.yml

@@ -19,7 +19,11 @@ jobs:
 
       - name: Set env vars
         run: |
-          GIT_BRANCH="${GITHUB_REF#refs/heads/}"
+          if [ -n "$GITHUB_BASE_REF" ]; then
+            GIT_BRANCH="$GITHUB_BASE_REF"
+          else
+            GIT_BRANCH="${GITHUB_REF#refs/heads/}"
+          fi
           echo "GIT_BRANCH = $GIT_BRANCH"
           if [ -z "$GIT_BRANCH" ]; then exit 1; fi
 
@@ -107,7 +111,11 @@ jobs:
     steps:
       - name: Set env vars
         run: |
-          GIT_BRANCH="${GITHUB_REF#refs/heads/}"
+          if [ -n "$GITHUB_BASE_REF" ]; then
+            GIT_BRANCH="$GITHUB_BASE_REF"
+          else
+            GIT_BRANCH="${GITHUB_REF#refs/heads/}"
+          fi
           echo "GIT_BRANCH = $GIT_BRANCH"
           if [ -z "$GIT_BRANCH" ]; then exit 1; fi
 

.github/workflows/ubuntu.yml

@@ -19,7 +19,11 @@ jobs:
 
       - name: Set env vars
         run: |
-          GIT_BRANCH="${GITHUB_REF#refs/heads/}"
+          if [ -n "$GITHUB_BASE_REF" ]; then
+            GIT_BRANCH="$GITHUB_BASE_REF"
+          else
+            GIT_BRANCH="${GITHUB_REF#refs/heads/}"
+          fi
           echo "GIT_BRANCH = $GIT_BRANCH"
           if [ -z "$GIT_BRANCH" ]; then exit 1; fi
 
@@ -123,7 +127,11 @@ jobs:
     steps:
       - name: Set env vars
         run: |
-          GIT_BRANCH="${GITHUB_REF#refs/heads/}"
+          if [ -n "$GITHUB_BASE_REF" ]; then
+            GIT_BRANCH="$GITHUB_BASE_REF"
+          else
+            GIT_BRANCH="${GITHUB_REF#refs/heads/}"
+          fi
           echo "GIT_BRANCH = $GIT_BRANCH"
           if [ -z "$GIT_BRANCH" ]; then exit 1; fi