Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

main vs development branch #57

Open
angerman opened this issue May 4, 2023 · 6 comments
Open

main vs development branch #57

angerman opened this issue May 4, 2023 · 6 comments

Comments

@angerman
Copy link
Collaborator

angerman commented May 4, 2023

As we are now having more and more users, we need to be a bit more cautious about breaking main.

As such I suggest we start having a develop branch, and make main highly protected. Only merge to main when an extended CI suite has passed from develop?

@hamishmack @yvan-sraka @andreabedini thoughts?

@yvan-sraka
Copy link
Contributor

yvan-sraka commented May 4, 2023

What about using main as an unstable track, but rather inviting users to checkout to a latest branch that points to the latest release tag? (and so define some lightweight release process)

@hamishmack
Copy link
Collaborator

We should add the branch to the ghcr references too (currently I think the GitHub actions just pick up the latest version of the ghcr files).

@angerman
Copy link
Collaborator Author

angerman commented May 4, 2023

What about using main as an unstable track, but rather inviting users to checkout to a latest branch that points to the latest release tag? (and so define some lightweight release process)

That makes the nix develop command mor hairy as you need to embed the latest then. Id rather keep the nix develop github:input-output-hi/DevX working. Which means that needs to be the default branch.

@angerman
Copy link
Collaborator Author

angerman commented May 4, 2023

We should add the branch to the ghcr references too (currently I think the GitHub actions just pick up the latest version of the ghcr files).

I think I changed the rules so that only the main branch triggers builds. And other branches need manual triggers.

@andreabedini
Copy link
Member

The current wisdom seems to avoid long running living branches like develop. I guess we can find a way to merge into main only when tests pass? Or, if "test passing" is not enough to give us confidence, we can tag releases (and pre-releases perhaps).

@angerman
Copy link
Collaborator Author

angerman commented May 18, 2023

I like this idea of auto-merging develop into main (or call it production), whenever automated checked on main or develop or what ever the primary development branch is go green. 👍

This can be completely automated with GitHub action workflows, so it should be rather painless and give us some piece of mind that stuff still works.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants