Git Promotion Obstacle
Background
We are using the Git Promotion workflow with a single repository and two long-lived branches:
stagingmain- The de-staging workspace is linked to the
staging- The de-prod workspace is linked to the
main- In the de-staging workspace, we promote changes by targeting the
main- In de-prod, developers are set as operators with additional privileges to create resources and variables that are intentionally not managed by Git sync.
Intended Development Flow
1. A developer makes changes in the de-staging workspace UI.
2. Windmill creates a commit on the
staging3. A GitHub Action opens a PR from
stagingmain4. The PR is reviewed and merged into
main5. The
mainwmill sync push --workspace de-prodIssue
We are seeing files “ping-pong” between environments. After a change is made in de-staging and merged into
mainQuestions
1. Is there a reference Git Promotion example repository or a recommended workflow for this pattern? We are currently using push-on-merge found in a repo (possibly incorrect for this workflow). This action does not sync the workspace because the commit message starts with [WM]. We locally sync the workspace after pulling origin/main, hence item 5 (above)
2. Is there a Windmill lock file that may need to be rebased or reset to prevent this drift?
