Skip to content

fix: BASE_REF detection in merge queue #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pweyck merged 1 commit into from
Sep 30, 2025
Merged

fix: BASE_REF detection in merge queue #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions shopware-version/shopware-version.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,44 @@ set -e
set pipefail

get_ref() {
local ref

PR_NR=$(echo "${REF}" | sed -E -n "s|^refs/heads/gh-readonly-queue/[^/]+/pr-([0-9]+)-.*$|\1|p")
PR_NR=$(echo "${1}" | sed -E -n "s|^(refs/heads/)?gh-readonly-queue/[^/]+/pr-([0-9]+)-.*$|\2|p")
if [[ -n "${PR_NR}" ]]; then
echo "refs/heads/$(gh pr view --repo "${CURRENT_REPO}" "${PR_NR}" --jq '.headRefName' --json headRefName)"
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)"
return
fi

#remove whitespace from HEAD_REF with bash substitution
HEAD_REF=${HEAD_REF// /}
if [[ -n "${HEAD_REF}" ]]; then
echo "refs/heads/${HEAD_REF#"refs/heads/"}"
echo 'Using HEAD_REF as REF'
REF="refs/heads/${HEAD_REF#"refs/heads/"}"
else
#remove whitespace from REF with bash substitution
REF=${REF// /}
echo "refs/heads/${REF#"refs/heads/"}"
REF="refs/heads/${REF#"refs/heads/"}"
fi
}

get_base_ref() {
PR_NR=$(echo "${1}" | sed -E -n "s|^refs/heads/gh-readonly-queue/[^/]+/pr-([0-9]+)-.*$|\1|p")
PR_NR=$(echo "${1}" | sed -E -n "s|^(refs/heads/)?gh-readonly-queue/[^/]+/pr-([0-9]+)-.*$|\2|p")
if [[ -n "${PR_NR}" ]]; then
echo "$(gh pr view --repo "${CURRENT_REPO}" "${PR_NR}" --jq '.baseRefName' --json baseRefName)"
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)"
return
fi

#remove whitespace from BASE_REF with bash substitution
BASE_REF=${BASE_REF// /}
if [[ -n "${BASE_REF}" ]]; then
echo "refs/heads/${BASE_REF#"refs/heads/"}"
BASE_REF="refs/heads/${BASE_REF#"refs/heads/"}"
fi
}

REF="$(get_ref)"
ORIGINAL_REF=${REF}
get_ref "${ORIGINAL_REF}"
echo "ref: ${REF}"
BASE_REF="$(get_base_ref "${REF}")"
get_base_ref "${ORIGINAL_REF}"
echo "base ref: ${BASE_REF}"

# if REPO does not start with https add https://github.com/
Expand Down