From 344c20d7900f40aa0fc5bcde9222254b909dd0c5 Mon Sep 17 00:00:00 2001 From: Yusuke KUOKA Date: Tue, 22 Jan 2019 11:25:55 +0900 Subject: [PATCH] release: fix make tasks for auto-tagging --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1488a28e..a4a53fd1 100644 --- a/Makefile +++ b/Makefile @@ -63,13 +63,15 @@ LAST = $(shell git describe --tags --abbrev=0 HEAD^) BODY = "`git log ${LAST}..HEAD --oneline --decorate` `printf '\n\#\#\# [Build Info](${BUILD_URL})'`" release/minor: - git fetch origin master + git checkout master + git pull --rebase origin master bash -c 'if git branch | grep autorelease; then git branch -D autorelease; else echo no branch to be cleaned; fi' git checkout -b autorelease origin/master - hack/semtag final -s minor + bash -c 'SEMTAG_REMOTE=origin hack/semtag final -s minor' release/patch: - git fetch origin master + git checkout master + git pull --rebase origin master bash -c 'if git branch | grep autorelease; then git branch -D autorelease; else echo no branch to be cleaned; fi' git checkout -b autorelease origin/master - hack/semtag final -s patch + bash -c 'SEMTAG_REMOTE=origin hack/semtag final -s patch'