Skip to content

fix: resolve pr head branch on merge-queue#164

Merged
Marcel Kräml (mkraeml) merged 2 commits into
mainfrom
fix/shopware-version-resolve-head-ref-on-merge-queue
Jun 17, 2026
Merged

fix: resolve pr head branch on merge-queue#164
Marcel Kräml (mkraeml) merged 2 commits into
mainfrom
fix/shopware-version-resolve-head-ref-on-merge-queue

Conversation

@larskemper

@larskemper Lars Kemper (larskemper) commented Jun 16, 2026

Copy link
Copy Markdown
Member

Problem

Since #163, branch sync ignores matching downstream branches in the queue.
Coupled upstream + downstream branches failing in the queue.

get_ref() detects the queue but no longer resolves the head branch:

echo "Merge queue detected. Using REF"
return                      # REF stays = gh-readonly-queue/... (only exists upstream)

That ref never exists downstream, so step 1 always misses and falls back to trunk.
It's invisible for prs without a matching downstream branch.

#163 "queue stays open while downstream runs" is about timing and still holds. this
only re adds which branch to check out, a separate concern.

upstream: shopware/shopware#17306
downstream: https://github.com/shopware/SwagCommercial/pull/2907
faling commercial run: https://github.com/shopware/SwagCommercial/actions/runs/27616756826

@mkraeml

Copy link
Copy Markdown
Contributor

This will introduce the old behavior again 🙈
I think we need to extend the check loop to also check the head branch if it doesn't find the merge queue

@mkraeml

Copy link
Copy Markdown
Contributor

I've changed the code to also resolve the HEAD_REF and test this if the REF is not found.
We changed the get_ref code to be able to merge external contributions.

@mkraeml Marcel Kräml (mkraeml) merged commit 63dc978 into main Jun 17, 2026
8 checks passed
@mkraeml Marcel Kräml (mkraeml) deleted the fix/shopware-version-resolve-head-ref-on-merge-queue branch June 17, 2026 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants