Chaotic repo branching structure

[kimburgess]

Over the past 12 - 18 months the branching structure has devolved into an overly complex mix of long-running feature branches and a neglected master / beta release channel. Some housekeeping is currently in place to correct and simplify this.

Changes will be communicated here as they are enacted.

Please be advised that there will be some volatility and high PR churn while this takes place. If you are dis-interested it may be a good idea to mute notifications for a little while.

[kimburgess]

Given this repo has now been running for a while with beta as the default branch and deploy config as seperate forks, I feel like the safer option may be to just deprecate the old master branch.

@w-le if this happens, can you comment on high tightly any other tooling may be using specific branch names vs just pulling the default? Is it safe to rename this to properly reflect their current usage?

[kimburgess]

@w-le bump.

[w-le]

yep agreed, I can confirm that downstream automation is just using the default branch (which is currently beta) so it would be fine and safe to delete master branch and leave beta as the default

https://gitlab.com/aca-engine/deploy/o365-engine/-/blob/master/Dockerfile#L26
https://gitlab.com/aca-engine/deploy/setup/-/blob/master/roles/engine/tasks/main.yml#L12

[kimburgess]

Closing with beta in place as default branch.