From 8c8996d0baf2b0a4eba4ed8b1f74d6ccb5191995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Kr=C3=A4ml?= Date: Tue, 16 Jun 2026 10:39:51 +0200 Subject: [PATCH] fi(shopware-version): use ref on merge-queue --- shopware-version/shopware-version.bash | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shopware-version/shopware-version.bash b/shopware-version/shopware-version.bash index e795039..299f69a 100755 --- a/shopware-version/shopware-version.bash +++ b/shopware-version/shopware-version.bash @@ -14,8 +14,7 @@ set pipefail get_ref() { PR_NR=$(echo "${1}" | sed -E -n "s|^(refs/heads/)?gh-readonly-queue/[^/]+/pr-([0-9]+)-.*$|\2|p") if [[ -n "${PR_NR}" ]]; then - echo "Merge queue detected. Using PR_NR: ${PR_NR} to fetch REF" - REF="refs/heads/$(gh pr view --repo "${CURRENT_REPO}" "${PR_NR}" --jq '.headRefName' --json headRefName)" + echo "Merge queue detected. Using REF" return fi @@ -35,7 +34,7 @@ get_base_ref() { PR_NR=$(echo "${1}" | sed -E -n "s|^(refs/heads/)?gh-readonly-queue/[^/]+/pr-([0-9]+)-.*$|\2|p") if [[ -n "${PR_NR}" ]]; then echo "Merge queue detected. Using PR_NR: ${PR_NR} to fetch BASE_REF" - BASE_REF="$(gh pr view --repo "${CURRENT_REPO}" "${PR_NR}" --jq '.baseRefName' --json baseRefName)" + BASE_REF="$(gh pr view --repo "${CURRENT_REPO}" "${PR_NR}" --jq '.baseRefName' --json baseRefName || true)" return fi