Fix merge-release-pr job failing after a successful merge#69
Conversation
The job runs in a login shell (bash --login) with `set -e`. On the successful-merge path the script calls `exit 0`, which makes bash source ~/.bash_logout, whose default `clear_console` exits non-zero with no TTY (as in CI). With `set -e` still active that flips the status, failing the job even though the PR was merged. Disable `set -e` before that `exit 0`. Co-authored-by: Cursor <cursoragent@cursor.com>
|
Your development orb has been published. It will expire in 30 days. |
The exact exit code can be rewritten by ~/.bash_logout, so include it in the failure message to preserve it for debugging. Co-authored-by: Cursor <cursoragent@cursor.com>
|
Your development orb has been published. It will expire in 30 days. |
Restructure so the script never calls `exit 0`: on success it falls off the end of the script, which does not source ~/.bash_logout and so avoids the clear_console/set -e interaction without needing `set +e`. Co-authored-by: Cursor <cursoragent@cursor.com>
|
Your development orb has been published. It will expire in 30 days. |
The enqueue failure code is effectively always 1 and adds no useful detail. Co-authored-by: Cursor <cursoragent@cursor.com>
|
Your development orb has been published. It will expire in 30 days. |
tonidero
left a comment
There was a problem hiding this comment.
Right, makes more sense. Thanks for cleaning it up!
This reverts commit a7a5810.
Co-authored-by: Cursor <cursoragent@cursor.com>
|
Your development orb has been published. It will expire in 30 days. |
|
Your development orb has been published. It will expire in 30 days. |
|
Your development orb has been published. It will expire in 30 days. |
1 similar comment
|
Your development orb has been published. It will expire in 30 days. |
|
Your orb has been published to the CircleCI Orb Registry. |
### Motivation Pull in [sdks-circleci-orb#69](RevenueCat/sdks-circleci-orb#69), which fixes the `merge-release-pr` job failing after a successful merge. ### Description Bump the CircleCI orb to `3.21.2`. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Low Risk** > Single CI orb version bump with no application or runtime code changes; risk is limited to pipeline behavior differences from the orb update. > > **Overview** > Bumps the **`revenuecat/sdks-common-config`** CircleCI orb from **3.16.0** to **3.21.2** in `.circleci/config.yml`. > > This picks up the upstream fix for **`revenuecat/merge-release-pr`** failing after a successful release merge (see sdks-circleci-orb#69). All existing jobs that use the orb (gems, Maestro, Danger, tag/merge release workflow, etc.) now run against the newer orb definition. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit 74109ff. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
### Motivation Pull in [sdks-circleci-orb#69](RevenueCat/sdks-circleci-orb#69), which fixes the `merge-release-pr` job failing after a successful merge. ### Description Bump the CircleCI orb to `3.21.2`. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Low Risk** > Single orb version bump with no application or pipeline structure changes; risk is limited to CI/release automation behavior. > > **Overview** > Updates the CircleCI **`revenuecat/sdks-common-config`** orb from **3.16.0** to **3.21.2** in `.circleci/config.yml`. No workflow or job definitions in this repo change—only the orb version pin. > > This pulls in a fix from the shared orb so **`revenuecat/merge-release-pr`** (used in the deploy workflow after `github-release`) no longer fails after a successful merge. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit 7307d9e. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
### Motivation Pull in [sdks-circleci-orb#69](RevenueCat/sdks-circleci-orb#69), which fixes the `merge-release-pr` job failing after a successful merge. ### Description Bump the CircleCI orb to `3.21.2`. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Low Risk** > Single orb version bump in CI config only; no application or release job definition changes in-repo. > > **Overview** > Bumps the shared **`revenuecat/sdks-common-config`** CircleCI orb from **3.21.1** to **3.21.2** in `.circleci/config.yml`. > > This pulls in a fix for **`revenuecat/merge-release-pr`** (used at the end of the release workflow after `docs-deploy`) so the job no longer fails after a successful merge. No other pipeline jobs or workflow wiring change in this PR. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit a6ab014. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
### Motivation Pull in [sdks-circleci-orb#69](RevenueCat/sdks-circleci-orb#69), which fixes the `merge-release-pr` job failing after a successful merge. ### Description Bump the CircleCI orb to `3.21.2`. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Low Risk** > CI-only dependency version bump with no application code changes; intended to fix a post-release pipeline failure. > > **Overview** > Bumps the **`revenuecat/sdks-common-config`** CircleCI orb from **3.20.0** to **3.21.2** in `.circleci/config.yml`. > > This picks up the orb fix from [sdks-circleci-orb#69](RevenueCat/sdks-circleci-orb#69) so the **`revenuecat/merge-release-pr`** step in the deploy workflow no longer fails after a release merge succeeds. All other jobs that use shared `revenuecat/*` commands inherit the new orb version unchanged. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit 1227260. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
### Motivation Pull in [sdks-circleci-orb#69](RevenueCat/sdks-circleci-orb#69), which fixes the `merge-release-pr` job failing after a successful merge. ### Description Bump the CircleCI orb to `3.21.2`.
SEMVER Update Type:
Description:
Restructure
merge-release-pr.shso the successful-merge path falls off the end of the script instead of callingexit 0.Motivation:
The job runs in a login shell (
bash --login) withset -e. Theexitbuiltin makes bash source~/.bash_logout, whose defaultclear_consoleexits non-zero with no TTY (as in CI);set -ethen flips the status, failing the job even though the PR was already merged. Falling off the end of the script does not source~/.bash_logout, so the success path avoids it entirely.A
set +ebeforeexit 0would also work but was deliberately avoided, to keepset -eprotection intact rather than rely on a workaround. Confirmed incimg/ruby:3.2.0:exit 0exits 1 while falling off the end exits 0.