From 6bfe76d6d1a93c850739e8acac73ab04da111cbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sviatoslav=20Sydorenko=20=28=D0=A1=D0=B2=D1=8F=D1=82=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B0=D0=B2=20=D0=A1=D0=B8=D0=B4=D0=BE=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BA=D0=BE=29?= <wk@sydorenko.org.ua>
Date: Fri, 13 Sep 2024 20:42:48 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA=F0=9F=9A=91=20Fix=20running=20awx?=
 =?UTF-8?q?=20image=20in=20CI=20on=20merge=20(#15510)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a variation of #15509, fixing the `run_awx_devel` in-tree
action this time.
---
 .github/actions/run_awx_devel/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/run_awx_devel/action.yml b/.github/actions/run_awx_devel/action.yml
index 8144f3c26b..59eb33f62c 100644
--- a/.github/actions/run_awx_devel/action.yml
+++ b/.github/actions/run_awx_devel/action.yml
@@ -36,7 +36,7 @@ runs:
       shell: bash
       run: |
         DEV_DOCKER_OWNER=${{ github.repository_owner }} \
-        COMPOSE_TAG=${{ github.base_ref }} \
+        COMPOSE_TAG=${{ github.base_ref || github.ref_name }} \
         COMPOSE_UP_OPTS="-d" \
         make docker-compose