Skip to content

build-test-recipe.yml: add support for merge queue builds #13773

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
merged 1 commit into from
Oct 8, 2025
Merged

build-test-recipe.yml: add support for merge queue builds #13773

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
23 changes: 18 additions & 5 deletions .github/workflows/build-test-recipe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
BEFORE_SHA: ${{ github.event.before }}
AFTER_SHA: ${{ github.event.after }}
MERGE_GROUP_BASE_SHA: ${{ github.event.merge_group.base_sha }}
MERGE_GROUP_HEAD_SHA: ${{ github.event.merge_group.head_sha }}
run: |
if [ -n "$BASE_REF" ] && [ -n "$HEAD_REF" ] && [ -n "$HEAD_SHA" ]; then
# Pull Request
Expand All @@ -39,6 +41,10 @@ jobs:
FORK_POINT=$(git merge-base "$BASE_REF" "$HEAD_SHA")
DIFF=$(git diff --name-only --diff-filter=d "$FORK_POINT" "$HEAD_SHA")
echo "Diff between $FORK_POINT and $HEAD_SHA"
elif [ -n "$MERGE_GROUP_BASE_SHA" ] && [ -n "$MERGE_GROUP_HEAD_SHA" ]; then
# Merge Group
DIFF=$(git diff --name-only --diff-filter=d "$MERGE_GROUP_BASE_SHA" "$MERGE_GROUP_HEAD_SHA")
echo "Diff between $MERGE_GROUP_BASE_SHA and $MERGE_GROUP_HEAD_SHA"
elif [ -n "$BEFORE_SHA" ] && [ -n "$AFTER_SHA" ]; then
# Push to a branch
DIFF=$(git diff --name-only --diff-filter=d "$BEFORE_SHA" "$AFTER_SHA")
Expand All @@ -55,13 +61,20 @@ jobs:
env:
EVENT_NAME: ${{ github.event_name }}
PR_BASE_REF: ${{ github.event.pull_request.base.ref }}
MERGE_GROUP_BASE_REF: ${{ github.event.merge_group.base_ref }}
REF_NAME: ${{ github.ref_name }}
run: |
if [[ "$EVENT_NAME" == "pull_request" ]]; then
RELEASE=$(echo "$PR_BASE_REF" | cut -d- -f1)
else
RELEASE=$(echo "$REF_NAME" | cut -d- -f1)
fi
case "$EVENT_NAME" in
"pull_request")
RELEASE=$(echo "$PR_BASE_REF" | cut -d- -f1)
;;
"merge_group")
RELEASE=$(echo "$MERGE_GROUP_BASE_REF" | cut -d- -f1)
;;
*)
RELEASE=$(echo "$REF_NAME" | cut -d- -f1)
;;
esac
echo "Determined release: $RELEASE"
echo "release=${RELEASE}" >> $GITHUB_OUTPUT
build-test:
Expand Down
Loading