Skip to content

Fall back to auto-merge + branch update when direct merge fails #48

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

Open
ajpallares wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fall back to auto-merge + branch update when direct merge fails #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cafe27
Fall back to auto-merge + branch update when direct merge fails
ajpallares Apr 9, 2026
3cbc6fb
Extract release_branch variable to avoid repetition
ajpallares Apr 9, 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
31 changes: 29 additions & 2 deletions src/scripts/merge-release-pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,40 @@ else
version="$(tr -d '\n' < "${VERSION_FILE}")"
fi

release_branch="release/${version}"

using_merge_queue=false
merge_queue_arg=""
if [ "${USE_MERGE_QUEUE}" = "1" ] || [ "${USE_MERGE_QUEUE}" = "true" ]; then
using_merge_queue=true
merge_queue_arg="use_merge_queue:true"
fi

merge_exit_code=0
bundle exec fastlane run merge_pr \
repo_name:"${REPO_NAME}" \
branch:"release/${version}" \
branch:"${release_branch}" \
merge_method:"${MERGE_METHOD}" \
${merge_queue_arg}
${merge_queue_arg} || merge_exit_code=$?

if [ "${merge_exit_code}" -eq 0 ]; then
exit 0
fi

if [ "${using_merge_queue}" = true ]; then
echo "Merge queue enqueue failed."
exit "${merge_exit_code}"
fi

echo "Direct merge failed. Enabling auto-merge and updating branch..."

bundle exec fastlane run enable_auto_merge_for_pr \
repo_name:"${REPO_NAME}" \
branch:"${release_branch}" \
merge_method:"${MERGE_METHOD}"

bundle exec fastlane run update_pr_branch \
repo_name:"${REPO_NAME}" \
branch:"${release_branch}"

echo "Auto-merge enabled and branch updated. The PR will merge automatically once CI passes."