Skip to content

fix: Stop the release build when merging main conflicts #1371

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

Closed
BaggioWongHK wants to merge 2 commits into from
Closed

fix: Stop the release build when merging main conflicts #1371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3978dc
fix: Stop the release build when merging main conflicts
Oct 7, 2026
98853f8
fix: Comment on the release PR when merging main conflicts
Oct 7, 2026
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: 22 additions & 1 deletion .github/workflows/build-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,34 @@ jobs:
- name: Create or merge release branch
# Note - CodeBuild depends on this branch name. Don't change without corresponding backend change.
id: check_branch
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: release-${{ steps.calc_target.outputs.target_version }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
run: |
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
if git ls-remote --exit-code --heads origin release-${{ steps.calc_target.outputs.target_version }}; then
echo "Branch exists, merging latest changes in"
git checkout release-${{ steps.calc_target.outputs.target_version }}
git merge main
# Stop on a conflict. This shell does not exit on errors, so an unfinished merge used to be
# committed, conflict markers included, by "Commit .in artifacts to branch" below.
if ! git merge main; then
CONFLICTS=$(git diff --name-only --diff-filter=U)
git merge --abort
echo "::error::Merging main into $BRANCH conflicted. Resolve it in a pull request into that branch, then rerun."
# Nothing was pushed, so the release PR shows no sign of this. Say so there, where maintainers look.
{
echo "Merging \`main\` into \`$BRANCH\` conflicted, so this build stopped and pushed nothing."
echo
echo "Conflicting files:"
echo "$CONFLICTS" | sed 's/^/- /'
echo
echo "Resolve the conflict in a pull request into \`$BRANCH\`, merge it, then re-run the failed jobs: $RUN_URL"
} > "$RUNNER_TEMP/merge-conflict.md"
gh pr comment "$BRANCH" --body-file "$RUNNER_TEMP/merge-conflict.md" || echo "::warning::Could not comment on the release PR."
exit 1
fi
git push
else
echo "Branch doesn't exist, creating now..."
Expand Down
Loading