From c048721852e2063fe043a263f9bba54f20d1d293 Mon Sep 17 00:00:00 2001 From: mkoester Date: Thu, 16 Nov 2017 10:21:07 +0100 Subject: [PATCH] Fix changing to release branch. --- perform-release.sh | 2 +- prepare-release.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/perform-release.sh b/perform-release.sh index cd77bf3bd1b..3520f74eed0 100755 --- a/perform-release.sh +++ b/perform-release.sh @@ -23,4 +23,4 @@ echo "Deploying release ${RELEASE_VERSION}" ./mvnw clean deploy -pl "\!osgi-support, \!osgi-support/mirror-subclass-plugin/, \!osgi-support/sdk-osgi-test-campaign/, \!osgi-support/commercetools-tests-fragment" -DskipTests -Prelease,javadoc-jdk-8u121 echo "Publish release javadoc ${RELEASE_VERSION}" -./mvnw javadoc:aggregate scm-publish:publish-scm -Ppublish-site,javadoc-jdk-8u121 \ No newline at end of file +./mvnw javadoc:aggregate scm-publish:publish-scm -Ppublish-site,javadoc-jdk-8u121 diff --git a/prepare-release.sh b/prepare-release.sh index 6f8f9c9c2e9..87cafcc0fef 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -115,4 +115,5 @@ git push origin ${CURRENT_BRANCH} echo Build directory ${TMPDIR} cd ${WORKDIR} -git checkout origin ${BRANCH_NAME} +git fetch +git checkout ${BRANCH_NAME}