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

Set default ci in master branch #470

Closed
wants to merge 3 commits into from
Closed

Conversation

alexandreLamarre
Copy link
Contributor

So that newer long-lived branches can default to configurations in there.

Remove default drone CI as well.

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>
Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>
Copy link
Contributor Author

@alexandreLamarre alexandreLamarre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code in master is a little outdated, so I decided it may not be worth the trouble to keep it up to date with our active release branches, rather it is more important that the github CI files are present there to set sane defaults for future long-lived branches (or feature branches)

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>
@mallardduck
Copy link
Member

I wonder if we just delete the master branch? Given that we develop on release branches, does it even make sense to use it at all? Or should we just plan to use w/e the highest release branch is to create the base for the next release branch? (I.e. release/v5.0 will become the base for release/v6.0 once we start on Rancher 2.10.x?)

Or are you thinking we use the master branch as an intermediate between releases? If so, how will we keep it in sync with the latest release branch?

@ericpromislow
Copy link
Collaborator

I assumed once we start working on rancher 2.10 (or 3.0, or whatever comes after 2.9) we'll branch release/v6.0 off of release/v5.0 and continue development there. And we can leave master for anything that wants a default branch that isn't tied to a release.

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

Successfully merging this pull request may close these issues.

3 participants