From b80fa4ae19d0cd855ad4fa68215a84d0a41e2ba7 Mon Sep 17 00:00:00 2001
From: Kobi Hikri <kobi.hikri@gmail.com>
Date: Tue, 28 Jul 2026 19:17:50 +0300
Subject: [PATCH] [ci] Bind the branch name to env before sanitising it into a
 docker tag (#17910)

---
 .github/workflows/ci-docker.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index da2d86f0414..96bf952965d 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -71,11 +71,13 @@ jobs:
 
       - name: Determine tag and whether to push
         id: tag
+        env:
+          HEAD_REF: ${{ github.head_ref || github.ref_name }}
         run: |
           # Sanitize the branch name into a valid docker tag: replace invalid
           # characters, ensure the first character is valid (tags must start
           # with [A-Za-z0-9_]), and cap the length at 128 characters.
-          branch="${{ github.head_ref || github.ref_name }}"
+          branch="$HEAD_REF"
           tag="${branch//[^a-zA-Z0-9_.-]/-}"
           case "$tag" in
             [a-zA-Z0-9_]*) ;;