Browser Build Issue: the current method to provide automatic sync causes errors about loop HOT 2 CLOSED

Here are the steps of the as-written code for automatic sync with LoopWorkspace commit e70136b.

Details

The way this currently works is this.

• Compare fork's alive branch with upstream's branch of name of branch you are trying to build
• If number of commits > 1, sync alive branch with upstream branch of same name, store a boolean variable that equates the condition # of commits > 1
• Proceed with build step
• Do a bunch of checking conditions (around what triggered the workflow, what env variables are set around automation, etc.)
• If aforementioned variable is true, do the actual syncing now, so
• Attempt to sync branch that user wants to build with upstream branch of same name
• Do some logging whether there were upstream changes
• Checkout updated codebase into build container
• Build
• Tag and artifact
• Upload to TF

We are now potentially running into issues, because we are attempting to sync alive with the upstream branch of same name, and it may have been created from a different branch and this can lead to merge conflicts for the attempted sync of alive, because the tooling we are using to sync (aormsby/[email protected]) will fail the pipeline (i.e. action) when it runs into merge conflicts upon attempted sync.

from loop.

This was fixed (for main) with LoopWorkspace PR 164 merged on 19 July 2024 as part of Loop 3.4.1 patch.

A similar update is expected for LoopWorkspace dev, but that one is less critical because the build for the dev branch is not broken.

from loop.