From 2d4413ae97c2ce24a6ef8b486fc70fa295ed64a4 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Mon, 27 Apr 2026 00:21:34 +0000
Subject: [PATCH] fix(ci): harden branch detection in Phoenix deploy workflows

actions/checkout@v4 checks out a detached HEAD, so
`git rev-parse --abbrev-ref HEAD` can return 'HEAD' instead of
the actual branch name, causing the Phoenix deploy target lookup
to miss the main/master match.

Use GITHUB_REF_NAME (set by Gitea Actions) with a git fallback,
matching the pattern already used in explorer-monorepo's
deploy-live.yml.

Affected workflows:
- deploy-to-phoenix.yml (deploy, deploy-atomic-swap-dapp, cloudflare)
- deploy-portal-live.yml (deploy)
- workflow-sources/deploy-to-phoenix.yml (kept byte-identical)

Co-Authored-By: Nakamoto, S <defi@defi-oracle.io>
---
 .gitea/workflow-sources/deploy-to-phoenix.yml | 15 ++++++++++++---
 .gitea/workflows/deploy-portal-live.yml       |  5 ++++-
 .gitea/workflows/deploy-to-phoenix.yml        | 15 ++++++++++++---
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflow-sources/deploy-to-phoenix.yml b/.gitea/workflow-sources/deploy-to-phoenix.yml
index fc71d20d..ca6446ed 100644
--- a/.gitea/workflow-sources/deploy-to-phoenix.yml
+++ b/.gitea/workflow-sources/deploy-to-phoenix.yml
@@ -36,7 +36,10 @@ jobs:
       - name: Trigger Phoenix deployment
         run: |
           SHA="$(git rev-parse HEAD)"
-          BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          BRANCH="${GITHUB_REF_NAME:-}"
+          if [ -z "$BRANCH" ] || [ "$BRANCH" = "HEAD" ]; then
+            BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          fi
           curl -sSf -X POST "${{ secrets.PHOENIX_DEPLOY_URL }}" \
             -H "Authorization: Bearer ${{ secrets.PHOENIX_DEPLOY_TOKEN }}" \
             -H "Content-Type: application/json" \
@@ -52,7 +55,10 @@ jobs:
       - name: Trigger Atomic Swap dApp deployment (Phoenix)
         run: |
           SHA="$(git rev-parse HEAD)"
-          BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          BRANCH="${GITHUB_REF_NAME:-}"
+          if [ -z "$BRANCH" ] || [ "$BRANCH" = "HEAD" ]; then
+            BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          fi
           curl -sSf -X POST "${{ secrets.PHOENIX_DEPLOY_URL }}" \
             -H "Authorization: Bearer ${{ secrets.PHOENIX_DEPLOY_TOKEN }}" \
             -H "Content-Type: application/json" \
@@ -74,7 +80,10 @@ jobs:
       - name: Request Cloudflare DNS sync (Phoenix)
         run: |
           SHA="$(git rev-parse HEAD)"
-          BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          BRANCH="${GITHUB_REF_NAME:-}"
+          if [ -z "$BRANCH" ] || [ "$BRANCH" = "HEAD" ]; then
+            BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          fi
           curl -sSf -X POST "${{ secrets.PHOENIX_DEPLOY_URL }}" \
             -H "Authorization: Bearer ${{ secrets.PHOENIX_DEPLOY_TOKEN }}" \
             -H "Content-Type: application/json" \
diff --git a/.gitea/workflows/deploy-portal-live.yml b/.gitea/workflows/deploy-portal-live.yml
index 0ca42392..c374c063 100644
--- a/.gitea/workflows/deploy-portal-live.yml
+++ b/.gitea/workflows/deploy-portal-live.yml
@@ -24,7 +24,10 @@ jobs:
       - name: Trigger portal-live deployment
         run: |
           SHA="$(git rev-parse HEAD)"
-          BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          BRANCH="${GITHUB_REF_NAME:-}"
+          if [ -z "$BRANCH" ] || [ "$BRANCH" = "HEAD" ]; then
+            BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          fi
           curl -sSf -X POST "${{ secrets.PHOENIX_DEPLOY_URL }}" \
             -H "Authorization: Bearer ${{ secrets.PHOENIX_DEPLOY_TOKEN }}" \
             -H "Content-Type: application/json" \
diff --git a/.gitea/workflows/deploy-to-phoenix.yml b/.gitea/workflows/deploy-to-phoenix.yml
index fc71d20d..ca6446ed 100644
--- a/.gitea/workflows/deploy-to-phoenix.yml
+++ b/.gitea/workflows/deploy-to-phoenix.yml
@@ -36,7 +36,10 @@ jobs:
       - name: Trigger Phoenix deployment
         run: |
           SHA="$(git rev-parse HEAD)"
-          BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          BRANCH="${GITHUB_REF_NAME:-}"
+          if [ -z "$BRANCH" ] || [ "$BRANCH" = "HEAD" ]; then
+            BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          fi
           curl -sSf -X POST "${{ secrets.PHOENIX_DEPLOY_URL }}" \
             -H "Authorization: Bearer ${{ secrets.PHOENIX_DEPLOY_TOKEN }}" \
             -H "Content-Type: application/json" \
@@ -52,7 +55,10 @@ jobs:
       - name: Trigger Atomic Swap dApp deployment (Phoenix)
         run: |
           SHA="$(git rev-parse HEAD)"
-          BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          BRANCH="${GITHUB_REF_NAME:-}"
+          if [ -z "$BRANCH" ] || [ "$BRANCH" = "HEAD" ]; then
+            BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          fi
           curl -sSf -X POST "${{ secrets.PHOENIX_DEPLOY_URL }}" \
             -H "Authorization: Bearer ${{ secrets.PHOENIX_DEPLOY_TOKEN }}" \
             -H "Content-Type: application/json" \
@@ -74,7 +80,10 @@ jobs:
       - name: Request Cloudflare DNS sync (Phoenix)
         run: |
           SHA="$(git rev-parse HEAD)"
-          BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          BRANCH="${GITHUB_REF_NAME:-}"
+          if [ -z "$BRANCH" ] || [ "$BRANCH" = "HEAD" ]; then
+            BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+          fi
           curl -sSf -X POST "${{ secrets.PHOENIX_DEPLOY_URL }}" \
             -H "Authorization: Bearer ${{ secrets.PHOENIX_DEPLOY_TOKEN }}" \
             -H "Content-Type: application/json" \