From e77ec699080e9412798a028e47c6f8cdedac264b Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Tue, 17 Mar 2026 12:27:17 -0700
Subject: [PATCH] Use correct branch reference for remote branches

---
 .github/workflows/shellcheck.yml | 2 +-
 .github/workflows/yamllint.yml   | 2 +-
 branch-release/branch_release.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
index c076740..ed28ea8 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/shellcheck.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
diff --git a/.github/workflows/yamllint.yml b/.github/workflows/yamllint.yml
index 2901ce2..6501a99 100644
--- a/.github/workflows/yamllint.yml
+++ b/.github/workflows/yamllint.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: yaml-lint
         uses: ibiqlik/action-yamllint@v3
diff --git a/branch-release/branch_release.sh b/branch-release/branch_release.sh
index 6c20df7..bf9b660 100755
--- a/branch-release/branch_release.sh
+++ b/branch-release/branch_release.sh
@@ -312,7 +312,7 @@ esac
 
 if [ -n "${NEXT_RELEASE:-}" ]; then
     TARGET_BRANCH=release${NEXT_RELEASE}-SNAPSHOT
-	if git rev-parse --verify --quiet "refs/heads/${TARGET_BRANCH}"; then
+	if git rev-parse --verify --quiet "refs/remotes/origin/${TARGET_BRANCH}"; then
         echo ""
         echo "Next ESR release '${TARGET_BRANCH}' exist. Merging ${TAG} to it."
 		MERGE_BRANCH="${NEXT_RELEASE}_fb_bot_merge_${RELEASE_NUM}"
@@ -329,7 +329,7 @@ if [ -n "${NEXT_RELEASE:-}" ]; then
                 if ! git rev-parse --verify --quiet "refs/tags/${NEXT_RELEASE}.0" ; then
                     echo "Monthly release ${NEXT_RELEASE}.0 doesn't exist. Check for branch."
                     TARGET_BRANCH=release${NEXT_RELEASE}-SNAPSHOT
-                    if git rev-parse --verify --quiet "refs/heads/${TARGET_BRANCH}"; then
+                    if git rev-parse --verify --quiet "refs/remotes/origin/${TARGET_BRANCH}"; then
                         # 'SNAPSHOT' branch exists but '.0' release hasn't been created. Merge to it!
                         MERGE_BRANCH="${NEXT_RELEASE}_fb_bot_merge_${RELEASE_NUM}"
                     else
@@ -354,7 +354,7 @@ if [ -z "${MERGE_BRANCH:-}" ]; then
 	MERGE_BRANCH=fb_bot_merge_${RELEASE_NUM}
 fi
 
-if git rev-parse --verify --quiet "refs/heads/${MERGE_BRANCH}"; then
+if git rev-parse --verify --quiet "refs/remotes/origin/${MERGE_BRANCH}"; then
 
 	RELEASE_DIFF="$(git log --cherry-pick --oneline --no-decorate "origin/${MERGE_BRANCH}..${GITHUB_SHA}" | grep -v -e '^$')"
 	if [ -z "${RELEASE_DIFF:-}" ]; then