search

finos / compliant-financial-infrastructure

Compliant Financial Infrastructure accelerates the development, deployment and adoption of cloud services in a way that adheres to common security and regulatory controls.
Apache License 2.0
128 stars 60 forks source link

Set 'main' to default branch and remove 'dev' #320

Closed thinkl33t closed 1 year ago

thinkl33t commented 1 year ago

We added dev as a workaround for our EKS CI not getting credentials when a branch came from externally. This is no longer a worry as the repo is laid out differently now, so we'd like to make main the... main branch again, and we never implemented a process for merging from dev to main, meaning the two have gotten out of sync often.

I discussed this on a call with @eddie-knight @AdrianHammond, and we agreed that this was the best way to proceed.

TheJuanAndOnly99 commented 1 year ago

@eddie-knight @thinkl33t I've just changed the default branch to main

eddie-knight commented 1 year ago

We can take care of the branch cleanup from here. Thanks @TheJuanAndOnly99 !

eddie-knight commented 1 year ago

Whoops, got a little handsy with the buttons there. Reopening until we finish the branch cleanup.

thinkl33t commented 1 year ago

This still requires work to identify and merge commits that exist in dev but never made it into main

thinkl33t commented 1 year ago

dev is ready to be archived - the work in it that never made it into main is specifically for badge automation and will be picked up later by the child modules.

@maoo @TheJuanAndOnly99 please can you archive off the dev branch at your convenience

maoo commented 1 year ago

@thinkl33t - all done, closing issue. Thanks!