Added manual workflow to create PRs merging default branch into "rele… #284

fballiano · 2025-04-01T21:17:07Z

This PR adds a manual workflow (that has to be called manually) that:

downloads https://raw.githubusercontent.com/mage-os/generate-mirror-repo-js/refs/heads/main/src/build-config/mageos-nightly-build-config.js
extract all the repos, with their default branch
cycles on every repo and creates a PR on that repo merging the default branch into release/1.x

To test it I've slightly modify it to only print the commands instead of executing them, this is the full list for review:

gh pr create --repo mage-os/mageos-magento2 --base "release/1.x" --head "2.4-develop" --title "Merge 2.4-develop into release/1.x" --body "This PR was automatically created to merge the 2.4-develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-security-package --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-inventory --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-inventory-composer-installer --base "release/1.x" --head "master" --title "Merge master into release/1.x" --body "This PR was automatically created to merge the master branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento2-page-builder --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-adobe-ims --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-adobe-stock-integration --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-composer-installer --base "release/1.x" --head "master" --title "Merge master into release/1.x" --body "This PR was automatically created to merge the master branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-composer --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-composer-root-update-plugin --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-composer-dependency-version-audit-plugin --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento2-sample-data --base "release/1.x" --head "2.4-develop" --title "Merge 2.4-develop into release/1.x" --body "This PR was automatically created to merge the 2.4-develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-commerce-data-export --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-coding-standard --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento2-functional-testing-framework --base "release/1.x" --head "develop" --title "Merge develop into release/1.x" --body "This PR was automatically created to merge the develop branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-zend-db --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-zend-loader --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-zend-pdf --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-zend-cache --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-zend-exception --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-zend-log --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."
gh pr create --repo mage-os/mageos-magento-zend-memory --base "release/1.x" --head "main" --title "Merge main into release/1.x" --body "This PR was automatically created to merge the main branch into the release/1.x branch."

It uses MAGE_OS_CI_TOKEN which I think should have enough privileges to do all it needs to do
It could be better to just output the commands instead of running them, if we want to be safe... opinions?

…ase/1.x"

rhoerr · 2025-04-02T01:46:19Z

Visually, the code seems good. Thank you for putting it together.

@Vinai Thoughts? The idea is to streamline the process of updating release branches for 2.4.8/Mage-OS 1.1 next week.

Some concerns, thinking about it in more depth:

Do we need to restrict who can run this workflow? Like https://github.com/mage-os/generate-mirror-repo-js/blob/main/.github/workflows/build-mageos-release.yml#L42
Is there a reasonable or practical way to not have the dependence on the remote repo file https://raw.githubusercontent.com/mage-os/generate-mirror-repo-js/refs/heads/main/src/build-config/mageos-nightly-build-config.js ? (This is not worth the time or complexity of resolving right now.)
If it hits a merge conflict, what does resolving it look like? Would that mean manually merging release/1.x onto 2.4-develop to complete the PR? Are branch protections going to be a problem? Do we need to create an intermediary branch to merge from instead?
Possibly fundamental problem: we probably want to target specific commit hashes for the final merge for 2.4.8 -> 1.1. Otherwise it's possible or likely that the most recent (HEAD) commit on 2.4-develop is actually newer than the commit used to build 2.4.8 upstream, meaning we're publishing some code from upstream that's not necessarily stable yet. Maybe we consider this acceptable risk?. Otherwise, we could use this to speed up preliminary merges (as we prep for 1.1 this week), but then would still need to re-merge by repo, identifying the proper source commit to merge for each repo.
- That's trickier than it should be: the actual tagged commit (IE 2.4.8) is unlinked and has build changes (composer versions and dependencies) that can't be merged directly. Also, the tagged version differs by repo. We'd have to get the latest tag, and then follow it to its closest parent commit on the main branch, and use that parent as the merge source. And that's assuming that they pushed all tags, which they often miss. And that wouldn't work until new tags are pushed, so wouldn't help us for pre-release prep and testing like now.

fballiano · 2025-04-02T12:43:11Z

For the time being I would run the pr creation manually, since I already have the list, then:

if there's no conflict -> we can merge it
if there are conflict -> we'll have to close the PR, fork the repo, and do the thing from the forked repo in order not to deal with branch protection rules...

fballiano · 2025-04-03T09:37:11Z

@rhoerr if you agree with my last document I'd create the PRs sooner than later

rhoerr · 2025-04-03T13:01:44Z

@rhoerr if you agree with my last document I'd create the PRs sooner than later

Yes, that sounds good, do it.

fballiano · 2025-04-03T13:36:46Z

@rhoerr I've created all the PRs

These ones have conflicts:
mage-os/mageos-magento2#128
mage-os/mageos-security-package#4
mage-os/mageos-magento2-page-builder#5

Since the conflicts are not fixable directly within these PRs, would you like me to fork these 3 repos and create PRs on a proper editable branch? I'll make the PRs "editable by maintainers" so that you can fix the conflicts on my branch without having to do that on your own. Otherwise you could do it directly on your one but I can't help with that.

rhoerr · 2025-04-03T13:40:38Z

That would be great, thank you. Please fork and PR, and I can go through the conflicts.

The nonconflicting ones can be merged.

fballiano · 2025-04-03T13:47:14Z

@rhoerr will do, tech question, we should "rebase and merge" right?

rhoerr · 2025-04-03T13:49:33Z

@rhoerr will do, tech question, we should "rebase and merge" right?

I think create a merge commit to preserve branch histories. Do not squash since the source branch will stay around.

fballiano · 2025-04-03T14:47:08Z

@rhoerr I've merged all PRs that didn't have any conflict.

Then I created

which are the ones with conflicts, I think you should be able to edit them and commit on my branch as you like

rhoerr · 2025-04-08T13:15:02Z

As far as the branch protection issues go, I think the solution is to change the branch protection rules for each repository to only apply to the upstream and release branches (release/*, main, master, develop, depending on the repository). This seems safe to me, but I think @sprankhub has reservations.

fballiano added 2 commits April 1, 2025 22:12

Added manual workflow to create PRs merging default branch into "rele…

bc989a8

…ase/1.x"

Added manual workflow to create PRs merging default branch into "rele…

43ed55c

…ase/1.x"

fballiano requested a review from a team as a code owner April 1, 2025 21:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Added manual workflow to create PRs merging default branch into "rele… #284

Added manual workflow to create PRs merging default branch into "rele… #284

Uh oh!

fballiano commented Apr 1, 2025

Uh oh!

rhoerr commented Apr 2, 2025

Uh oh!

fballiano commented Apr 2, 2025

Uh oh!

fballiano commented Apr 3, 2025

Uh oh!

rhoerr commented Apr 3, 2025

Uh oh!

fballiano commented Apr 3, 2025

Uh oh!

rhoerr commented Apr 3, 2025

Uh oh!

fballiano commented Apr 3, 2025

Uh oh!

rhoerr commented Apr 3, 2025

Uh oh!

fballiano commented Apr 3, 2025

Uh oh!

rhoerr commented Apr 8, 2025

Uh oh!

Uh oh!

Added manual workflow to create PRs merging default branch into "rele… #284

Are you sure you want to change the base?

Added manual workflow to create PRs merging default branch into "rele… #284

Uh oh!

Conversation

fballiano commented Apr 1, 2025

Uh oh!

rhoerr commented Apr 2, 2025

Uh oh!

fballiano commented Apr 2, 2025

Uh oh!

fballiano commented Apr 3, 2025

Uh oh!

rhoerr commented Apr 3, 2025

Uh oh!

fballiano commented Apr 3, 2025

Uh oh!

rhoerr commented Apr 3, 2025

Uh oh!

fballiano commented Apr 3, 2025

Uh oh!

rhoerr commented Apr 3, 2025

Uh oh!

fballiano commented Apr 3, 2025

Uh oh!

rhoerr commented Apr 8, 2025

Uh oh!

Uh oh!