From 6a78f066a3b515f7ca2fcde2571ce152c0120b16 Mon Sep 17 00:00:00 2001 From: Timo Date: Wed, 5 May 2021 09:49:21 +0300 Subject: [PATCH] branch --- bamboo-specs/src/main/java/buildjob/PlanSpec.java | 2 -- bamboo-specs/src/main/resources/scripts/build.sh | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index 8ce2ea7a0..2668a6b90 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -79,8 +79,6 @@ public class PlanSpec { .checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Build") .location(ScriptTaskProperties.Location.FILE) .fileFromPath("bamboo-specs/src/main/resources/scripts/build.sh") - .environmentVariables("BAMBOO_DOWNLOAD_PASS=\"${bamboo.bamboo_download_pass}\"") - .environmentVariables("BAMBOO_DOWNLOAD_USER=\"${bamboo.bamboo_download_user}\"") .environmentVariables("BRANCH_NAME=\"${bamboo.planRepository.branchName}\"") .environmentVariables("PROJECT=\"" + project + "\"") ).dockerConfiguration( diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh index 91a022045..c4ec35988 100755 --- a/bamboo-specs/src/main/resources/scripts/build.sh +++ b/bamboo-specs/src/main/resources/scripts/build.sh @@ -3,16 +3,16 @@ imageName="nexus.iqser.com:5001/red/$PROJECT" dockerfileLocation="docker/$PROJECT/Dockerfile" -echo "On branch ${bamboo.planRepository.branchName} building project $PROJECT" +echo "On branch $BAMBOO_PLANREPOSITORY_BRANCHNAME building project $PROJECT" # shellcheck disable=SC2154 -if [[ "$BRANCH_NAME" == "master" ]] +if [[ "$BAMBOO_PLANREPOSITORY_BRANCHNAME" == "master" ]] then ./versions.sh minor version=$(jq -r '.version' < package.json) fi -if [[ "$BRANCH_NAME" == release* ]] +if [[ "$BAMBOO_PLANREPOSITORY_BRANCHNAME" == release* ]] then ./versions.sh patch version=$(jq -r '.version' < package.json)