From ee22cfe6798c8df90b91a10b26015175b4df5b0e Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 25 Jul 2013 19:07:58 +0200 Subject: [PATCH] correctly add new changelog entry --- maven_post_build_debian_wrapper.sh | 1 + maven_pre_build_debian_wrapper.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/maven_post_build_debian_wrapper.sh b/maven_post_build_debian_wrapper.sh index 02fc8e1..9537cf0 100755 --- a/maven_post_build_debian_wrapper.sh +++ b/maven_post_build_debian_wrapper.sh @@ -81,6 +81,7 @@ if [ "$GIT_BRANCH_NAME" = "master" ] || [ "${GIT_BRANCH_NAME:0:7}" = "hotfix/" ] sed -i "0,/UNRELEASED/s//$DISTRIBUTION/" debian/changelog else # change version in changelog + dch -i --no-auto-nmu "" git-dch -a --ignore-branch --no-full --no-meta --id-length=7 # replace first version (enclosed in brackets) with real version # we cannot use (git-)dch as the version might be lower than the last diff --git a/maven_pre_build_debian_wrapper.sh b/maven_pre_build_debian_wrapper.sh index 29edd6e..4ba334b 100755 --- a/maven_pre_build_debian_wrapper.sh +++ b/maven_pre_build_debian_wrapper.sh @@ -14,7 +14,7 @@ set -e cd $WORKSPACE # remove old maven repository if exists -[ -d .repository ] && rm .repository -rf +[ -d .repository ] && rm .repository -rf && echo "$WORKSPACE/.repository (used by Maven) removed" # clean up git git reset --hard -- 2.39.5