search

openhab / openhabian

openHABian - empowering the smart home, for Raspberry Pi and Debian systems
https://community.openhab.org/t/13379
ISC License
821 stars 252 forks source link

Rename master branch to main #1257

Closed mstormi closed 3 years ago

mstormi commented 3 years ago

see https://github.com/github/renaming/blob/main/README.md

mstormi commented 3 years ago

or rename openHAB3 to main ? @ecdye IIRC you mentioned that wdyt?

ecdye commented 3 years ago

I know that there have been issues with it causing a loss of commit history, and as such I'm inclined to wait and see what thee tools GitHub develops for migration will be as referenced in the document above.

If they end up never producing them then I would say do it on the openHAB3 branch after making a backup that way it will affect the end user less and we can push an update once all the bugs are sorted out.

For now, I think that we should wait.

mstormi commented 3 years ago

ok makes sense to me. Let's revisit this when Github has come out with something

pfink commented 3 years ago

Anyhow, the openHAB3 branch seems to be outdated and could be deleted already, correct?

mstormi commented 3 years ago

cough NO It's the new 'master' for OH3 in fact

pfink commented 3 years ago

Nevermind, I did read "30 commits behind master", but in fact it was "30 commits ahead of master" ^^

ecdye commented 3 years ago

@mstormi I have created the main branch, I am working on a PR that will finish preparing it to be the main branch.

mstormi commented 3 years ago

see https://github.com/orgs/openhab/teams/maintainers/discussions/6 Are you ready to switch ?

ecdye commented 3 years ago

Well there is a new github function to automate it. I think that the best way to proceed is to use that and then fix all references from openHAB 3 to main. I'll create a PR that has all the refrences to openHAB3 changed and then once you approve of that I'll Rename the branch and merge the PR right away. Sound good?

https://github.com/github/renaming

mstormi commented 3 years ago

Wondering though what about our stable/master 2-stage approach for OH3.

If "openHAB3" is the OH3 version of "master" then where's OH3 stable ? Or is it that and "main" is the new OH3 master ?

ecdye commented 3 years ago

I think that we no longer maintain a stable OH2 and once the branch has been renamed forward main to stable.

mstormi commented 3 years ago

Not a good idea. That would force all users of OH2 stable onto the OH3 branch, effectively breaking their setup unless they migrate to OH3 which they for sure don't want at that stage. It would also confuse everbody now that we told them to use stable to stay on OH2. I'd keep stable as the only OH2 branch (kill/rename master) and cease backporting future changes to stable except critical ones.

ecdye commented 3 years ago

That would work, so instead we would no longer have a stable branch for OH3?

mstormi commented 3 years ago

Simply add (not rename) main to become the new "master" for OH3. "openHAB3" would then become the stable branch for OH3.

ecdye commented 3 years ago

Well then, that adds a lot more complexity as we have to add support for both it and the OH3 branch. Would we want to simply swap master and main in the code to make it so that the master branch is no longer readily accessible but stable is?

That would also help to reduce the amount of re-coding needed and help to speed the transition.