Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

branch

Browse Source
This commit is contained in:
Timo 2021-05-05 09:49:21 +03:00
parent e35a2b02c9
commit 6a78f066a3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bamboo-specs/src/main/java/buildjob/PlanSpec.java
View File

@ -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(

6
bamboo-specs/src/main/resources/scripts/build.sh
View File

@ -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)