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

Do not start hotfix forcefully from master branch #6

Open
jkroepke opened this issue Dec 3, 2018 · 2 comments
Open

Do not start hotfix forcefully from master branch #6

jkroepke opened this issue Dec 3, 2018 · 2 comments

Comments

@jkroepke
Copy link

jkroepke commented Dec 3, 2018

In some conditions I have to backport hotfixes to older versions.

So I have to create a branch from an older tag (git checkout -b release-4.1.9 v4.1.9) apply the fixes (e.g. cherry pick from master), push the version (e.g. with

function set_modules_version {

) create a new git tag without merging the commit pack to master.

Following steps have to been executed manually:

git checkout -b release-4.1.9 v4.1.9
mvn versions:set -DnewVersion=4.1.9.1
# do stuff manually like git cherry-pick
git tag v4.1.9.1
git push --tags
@borisskert
Copy link
Owner

Hi Joe!

for backports you can adjust your hooks in the corresponding branch to perform the release on other branches than the default develop or master.

There is a merge request (#14) which is about to being merged and which fixes the release branches not to have the snapshot version included.
Maybe in this situation we can adjust the hooks and push the release branch automatically to resolve your issue.

@DG0lden
Copy link
Contributor

DG0lden commented Mar 12, 2019

Hi Joe and Boris,

I've made MR (#17) that may fix this issue as well.

regards, Denys

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

3 participants