[Commerce] Optimize commerce PR merge

[3ch023]

Hi all,

This is to discuss how/if we can optimize how Milo Commerce PRs are merged.

Problem statement

for commerce, we do have a build and our build artifacts are included in almost every commerce PR.
This means, when PR1 is merged to Stage, even if there is no conflict in /src files, there will be guaranteed conflicts in build artifacts, e.g.:

Idea

Since we are a big team and we want to have more than 1 commerce PR merged in Milo batch, I am thinking about automating the merge of conflicts for build artifacts. This automation only would be triggered if there is no merge conflicts in src file, of course those should be resolved by dev, not script.
Automation scripts would be triggered by a new merge of PR to Stage branch and check if there are conflicts only on commerce artifacts and perform automerge of stage branch in PR branch.

pseudo code

Trigger: merge of PR with lable commerce? will need to check
GH action running on PR:

• checkout PR branch
• check if diff is only in libs/deps/mas/commerce.js, libs/deps/mas/mas.js, libs/features/mas/dist/mas.js
• merge stage branch in PR branch
• cd libs/features/mas
• npm i
• npm run build
• npm run build:docs
• cd ../../../
• git add libs/deps/mas/*
• git add libs/features/mas/dist/mas.js
• set github user etc
• git commit --no-edit
• git push

This is just one of the ideas, pls feel free to share yours! Alternatively, I was thinking about puting build artifacts somewhere else, not git, but didn't find a good way.

[3ch023]

maybe we could only allow this action on PRs with commerce label.
to avoid impacting rest of PRs

[3ch023]

And also I would allow 3-5 file overlapts for all under /libs/features/mas and /libs/deps/mas

[npeltier]

both change sound good to me :) it may also push people adding commerce label ;)

[mokimo]

You might run into a few permission issues, especially if you have PRs raised from forks. There might be ways around that, but you'd have a workflow change both branches in adobecom & forks, which I doubt is easily possible for security reasons.

Another idea could be only creating the artifacts on merge to stage, however then you can't easily test changes on branches since the new artifacts don't exist there 🤔