Skip to content
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.

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

[Tooling] Remove Backmerge PR creation from the publish_release lane #23900

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

iangmaia
Copy link
Contributor

Reference: p1734366091645069-slack-CC7L49W13

After a discussion with @oguzkocer, we decided to remove the automatic creation of backmerge PRs from the publish_release lane. The main points:

  • Backmerge PRs can be problematic when repositories use a squash-merge strategy for Pull Requests
  • At this point, release branch changes should already be in the default branch
  • For exceptional cases (e.g., app store rejections requiring last-minute changes), teams can create backmerge PRs manually as needed

@iangmaia iangmaia added the Tooling Build, Release, and Validation Tools label Dec 16, 2024
@iangmaia iangmaia requested review from oguzkocer and a team December 16, 2024 18:12
@iangmaia iangmaia self-assigned this Dec 16, 2024
@dangermattic
Copy link
Collaborator

dangermattic commented Dec 16, 2024

1 Warning
⚠️ This PR is assigned to the milestone 25.6 ❄️. The due date for this milestone has already passed.
Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

@iangmaia iangmaia added this to the 25.6 ❄️ milestone Dec 16, 2024
@wpmobilebot
Copy link
Contributor

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr23900-ce2b3a1
Version25.6
Bundle IDorg.wordpress.alpha
Commitce2b3a1
App Center BuildWPiOS - One-Offs #11187
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr23900-ce2b3a1
Version25.6
Bundle IDcom.jetpack.alpha
Commitce2b3a1
App Center Buildjetpack-installable-builds #10225
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@oguzkocer oguzkocer merged commit c8b5184 into release/25.6 Dec 16, 2024
27 checks passed
@oguzkocer oguzkocer deleted the iangmaia/remove-publish-release-backmerge branch December 16, 2024 19:43
github-merge-queue bot pushed a commit that referenced this pull request Jan 2, 2025
* Remove Backmerge PR creation from the `publish_release` lane (#23900)

* Update app translations – `Localizable.strings`

* Update WordPress metadata translations

* Update Jetpack metadata translations

* Bump version number

---------

Co-authored-by: Ian Guedes Maia <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tooling Build, Release, and Validation Tools
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants