]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
fix build failure after merge to integration branch
authorHolger Levsen <holger@layer-acht.org>
Wed, 28 Aug 2013 12:02:05 +0000 (14:02 +0200)
committerHolger Levsen <holger@layer-acht.org>
Wed, 28 Aug 2013 12:02:05 +0000 (14:02 +0200)
maven_post_build_debian_wrapper.sh

index 39364adf332bf999e5cef90f8d7611cd0bf5c960..c367638f5b2107d60db052d17713e28b21a6b7e5 100755 (executable)
@@ -137,6 +137,8 @@ if [[ ${GIT_BRANCH_NAME:0:8} = "feature/" ]] || [[ ${GIT_BRANCH_NAME:0:7} = "bug
         if [[ "$BUILD_TRIGGERS" = *"merge"* ]]; then
         git push origin integration
         figlet "Pushed to integration."
+        # restore branch we were building from:
+        git branch -D $GIT_BRANCH_NAME
         git checkout origin/$GIT_BRANCH_NAME -b $GIT_BRANCH_NAME
     fi
 fi