master / live branch - review

OpenDataServices / org-ids

Front end application for http://org-id.guide

http://org-id.guide

Other

17 stars 9 forks source link

master / live branch - review #222

Closed odscjames closed 4 years ago

odscjames commented 4 years ago

If we are staying with live, it should be protected?
Do we want to move to master, as we have done elsewhere?
Can we make sure whatever we do is documented well somewhere?

Bjwebb commented 4 years ago

I think ideally we should move to master, but the lack of tests puts me off.

odscjames commented 4 years ago

Well, actually the process should be:

delete master branch
rename live to master
change salt scripts to deploy "master"
make sure master is protected in GitHub
check & update documentation

Then the lack of tests isn't a blocker to sorting this out because nothing should actually change on the live server (but we should tackle tests elsewhere)

Does that sound good?

Bjwebb commented 4 years ago

Happy to see this change, this is very much just the way we used to do things. (From back before protected branches were a thing, so that's why that isn't set up).

The point about tests is more about the manual testing in the current workflow: deploy master to the dev site, manually test the dev site, merge into live, then deploy to live. (Manual testing is important because we don't have much automated tests for this). So long as we're happy with the amount of testing in a new workflow, then its fine.

odscjames commented 4 years ago

Ah I see, I was confusing automatic testing with manual testing. I understand your point now. We should be able to set up something with branch deploys like we have for CoVE, for manual on-server testing.

odscjames commented 4 years ago

Early messages here have been overtaken by events.

Our default branch is now "live".

"master" is gone.

For manual testing - https://github.com/OpenDataServices/opendataservices-deploy/blob/main/salt/org-ids.sls#L145 - it's been possible to install extra branches for years.