Skip to content

Enable auto-merge on release PR after deploy#6363

Merged
ajpallares merged 7 commits into
mainfrom
pallares/enable-auto-merge-release-pr
Mar 3, 2026
Merged

Enable auto-merge on release PR after deploy#6363
ajpallares merged 7 commits into
mainfrom
pallares/enable-auto-merge-release-pr

Conversation

@ajpallares

@ajpallares ajpallares commented Feb 26, 2026

Copy link
Copy Markdown
Member

Checklist

  • No unit tests needed (CI config changes only)
  • N/A for purchases-android or hybrids

Motivation

After a release is tagged and all deploys finish, the release PR into main still requires manual merging. This automates it by enabling GitHub auto-merge on the release PR once all deploy jobs succeed.

Description

  • Adds all-tests-succeeded intermediate gate (split from all-tasks-passed) to separate the test gate from the release gate.
  • Reorders deploy-tag workflow so make-release runs after all deploy jobs (they only need the git tag, not the GitHub release).
  • Adds revenuecat/enable-auto-merge-release-pr (from the shared orb) as the final job in deploy-tag, requiring all other jobs. It uses the enable_auto_merge_for_pr plugin action to enable GitHub auto-merge on the release PR.
  • all-tasks-passed on release branches now gates on tag-release-branch, keeping it pending until the release is approved and tagged. Once auto-merge is enabled and this check passes, the PR merges automatically.
  • approve-release now requires all-tests-succeeded instead of all-tasks-passed.

Depends on:

- Add `all-tests-succeeded` gate job separate from `all-tasks-passed`
- Reorder `deploy-tag` workflow: deploys run first, `make-release` last
- Add `enable-auto-merge-release-pr` as final job in `deploy-tag`,
  requiring all other jobs before enabling GitHub auto-merge
- `all-tasks-passed` on release branches now gates on `tag-release-branch`
  so it stays pending until the release is approved and tagged
- `approve-release` requires `all-tests-succeeded` (not `all-tasks-passed`)

Depends on RevenueCat/fastlane-plugin-revenuecat_internal#115

Made-with: Cursor
@ajpallares ajpallares requested a review from a team as a code owner February 26, 2026 17:49
The Pluginfile and Gemfile.lock changes are not needed in this PR.
The dependency on the new plugin action will be satisfied once
fastlane-plugin-revenuecat_internal#115 is merged.

Made-with: Cursor
Comment thread .circleci/config.yml Outdated
Comment thread .circleci/config.yml Outdated

@cursor cursor Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Comment thread .circleci/config.yml Outdated

@tonidero tonidero left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is cool! 🚢

Comment thread .circleci/config.yml Outdated
name: All tests succeeded
command: echo "All tests succeeded"

enable-auto-merge-release-pr:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be worth moving these to the orb? Happy to merge and move later though.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes, You're right! Great suggestion!

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ajpallares ajpallares merged commit 1f5c500 into main Mar 3, 2026
36 checks passed
@ajpallares ajpallares deleted the pallares/enable-auto-merge-release-pr branch March 3, 2026 10:05
facumenzella pushed a commit that referenced this pull request Mar 5, 2026
* Enable auto-merge on release PR after deploy

- Add `all-tests-succeeded` gate job separate from `all-tasks-passed`
- Reorder `deploy-tag` workflow: deploys run first, `make-release` last
- Add `enable-auto-merge-release-pr` as final job in `deploy-tag`,
  requiring all other jobs before enabling GitHub auto-merge
- `all-tasks-passed` on release branches now gates on `tag-release-branch`
  so it stays pending until the release is approved and tagged
- `approve-release` requires `all-tests-succeeded` (not `all-tasks-passed`)

Depends on RevenueCat/fastlane-plugin-revenuecat_internal#115

Made-with: Cursor

* Remove temporary plugin branch pin

The Pluginfile and Gemfile.lock changes are not needed in this PR.
The dependency on the new plugin action will be satisfied once
fastlane-plugin-revenuecat_internal#115 is merged.

Made-with: Cursor

* Remove outdated comment above all-tasks-passed

Made-with: Cursor

* Strip trailing newline from .version when building branch name

Made-with: Cursor

* Use orb job for enable-auto-merge-release-pr

Made-with: Cursor
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants