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

release-process: create a stable branch when preparing a new release #2993

Merged
merged 1 commit into from
Jun 10, 2020

Conversation

ptrus
Copy link
Member

@ptrus ptrus commented Jun 10, 2020

Currently we create a stable release branch only once we need to backport some
changes. This PR changes the release process to create the stable branch when
creating a new release. This will ensure CI jobs hooked to stable/ branches,
such as building a release tagged CI docker image will be run for every
release.

NOTE: this could probably be automated within the tag-next-release make step (with an additional check to only run this when creating a new release and not when backporting), but I'm afraid i'm not enough of a makefile enthusiast to tackle that :/ - can open an issue though.

@ptrus ptrus requested a review from tjanez June 10, 2020 08:38
@ptrus ptrus force-pushed the ptrus/feature/release-branch branch 3 times, most recently from 67f51ce to a5da0e0 Compare June 10, 2020 08:44
@ptrus ptrus force-pushed the ptrus/feature/release-branch branch from a5da0e0 to 378c8c1 Compare June 10, 2020 08:51
Copy link
Member

@tjanez tjanez left a comment

Choose a reason for hiding this comment

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

Currently we create a stable release branch only once we need to backport some
changes. This PR changes the release process to create the stable branch when
creating a new release. This will ensure CI jobs hooked to stable/ branches,
such as building a release tagged CI docker image will be run for every
release.

Just want to clarify, we still want to do YY.X releases on the master branch because it will give us a reasonable good overall Change log (with all previous YY.X-1, ... releases in there).

NOTE: this could probably be automated within the tag-next-release make step (with an additional check to only run this when creating a new release and not when backporting), but I'm afraid i'm not enough of a makefile enthusiast to tackle that :/ - can open an issue though.

😁 Fair enough. Please, file an issue so we don't forget about it.

@@ -0,0 +1,7 @@
release: create a stable branch when preparing a new release
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
release: create a stable branch when preparing a new release
release: Create a stable branch when preparing a new release

Currently we create a stable release branch only once we need to backport some
changes. This PR changes the release process to create the stable branch when
creating a new release. This will ensure CI jobs hooked to stable/ branches,
such as building a release tagged CI docker image will be run for every
release.
@ptrus ptrus force-pushed the ptrus/feature/release-branch branch from 378c8c1 to 36d76ae Compare June 10, 2020 10:45
@ptrus ptrus merged commit e8b83e8 into master Jun 10, 2020
@ptrus ptrus deleted the ptrus/feature/release-branch branch June 10, 2020 10:53
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.

None yet

3 participants