Skip to content

Commit 9df2c40

Browse files
authored
update
1 parent fc5d66a commit 9df2c40

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

Java/before_deploy.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
echo "re-sourcing functions"
77
source travis/functions.Java.sh
88

9-
if tr_isSetAndNotFalse RELEASE && ! tr_isSet BUILD_PUBLISH; then
9+
echo conditional RELEASE
10+
echo conditional not BUILD_PUBLISH
11+
if tr_isSetAndNotFalse RELEASE && ! tr_isSetAndNotFalse BUILD_PUBLISH; then
1012
echo "RELEASE is set -> making ZIP-file"
1113
mkdir -p ziptemp/$ARTIFACT_ID
1214
cp -a target/* ziptemp/$ARTIFACT_ID
@@ -22,15 +24,19 @@ fi
2224

2325
rm -rf .deployment-env
2426
touch .deployment-env && echo "#!/usr/bin/env bash" >> .deployment-env
27+
echo conditional DEPLOYMENT_DIRNAME
2528
if tr_isSetAndNotFalse DEPLOYMENT_DIRNAME; then
2629
echo "DEPLOYMENT_DIRNAME=$DEPLOYMENT_DIRNAME" >> .deployment-env
2730
else
31+
echo conditional REGISTRY_PROJECT
2832
if tr_isSetAndNotFalse REGISTRY_PROJECT; then
2933
echo "DEPLOYMENT_DIRNAME=$REGISTRY_PROJECT" >> .deployment-env
3034
fi
3135
fi
3236

37+
echo conditional DOCKER_REGISTRY
3338
if tr_isSetAndNotFalse DOCKER_REGISTRY; then
39+
echo conditional BUILD_ARCH
3440
if tr_isSet BUILD_ARCH; then
3541
BUILD_ARCH_STR=-${BUILD_ARCH}
3642
fi
@@ -61,7 +67,8 @@ if tr_isSetAndNotFalse DOCKER_REGISTRY; then
6167
fi
6268

6369
source .deployment-env
64-
if ! tr_isSet BUILD_PUBLISH; then
70+
echo conditional BUILD_PUBLISH
71+
if ! tr_isSetAndNotFalse BUILD_PUBLISH; then
6572
echo "$REGISTRY_PASSWORD"| docker login -u "$REGISTRY_USER" --password-stdin "$REGISTRY_URL"
6673
docker info
6774
echo $ "docker build -t $LATEST_VER -t $MAJOR_VER -t $MINOR_VER -t $BUILD_VER ."
@@ -85,7 +92,8 @@ if tr_isSetAndNotFalse DOCKER_REGISTRY; then
8592
docker push $BUILD_VER && docker image rm $BUILD_VER
8693
echo "done preparing docker-deployment-phase"
8794
fi
88-
if tr_isSet BUILD_PUBLISH; then
95+
echo conditional BUILD_PUBLISH
96+
if tr_isSetAndNotFalse BUILD_PUBLISH; then
8997
source .deployment-env
9098
echo "$REGISTRY_PASSWORD"| docker login -u "$REGISTRY_USER" --password-stdin "$REGISTRY_URL"
9199
docker info

Java/deploy.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ source $TRAVIS/before_install.sh
99

1010
echo "starting deploy stage"
1111

12+
echo conditional DEPLOY
1213
if tr_isSetAndNotFalse DEPLOY; then
14+
echo conditional BUILD_ARCH
1315
if ! tr_isSet BUILD_ARCH; then
1416
rm -rf .env
1517
cp ./.deployment-env ./.env

0 commit comments

Comments
 (0)