diff --git a/bin/init_env b/bin/init_env index c52d6e9..afd3f92 100755 --- a/bin/init_env +++ b/bin/init_env @@ -141,12 +141,12 @@ function init_versions { #replace dots with - so 10.0.x turns into v10-0-x. k8s can't have dots in names setVar VERX_NO_DOTS "v${VERSIONX//./-}" - setVar BUILD_VERSION "$VERSION" + putVar BUILD_VERSION "$VERSION" # if its a snapshot then append the SNAPSHOT if [[ $(isTruthy "${snapshot:-}") ]]; then - setVar VERSION_POSTFIX "-SNAPSHOT" - setVar IS_SNAPSHOT true + putVar VERSION_POSTFIX "-SNAPSHOT" + putVar IS_SNAPSHOT true BUILD_VERSION+="-SNAPSHOT" VERX_NO_DOTS+="-SNAPSHOT" fi diff --git a/makefiles/spring-gradle.make b/makefiles/spring-gradle.make index bbb62e6..5c22824 100644 --- a/makefiles/spring-gradle.make +++ b/makefiles/spring-gradle.make @@ -84,12 +84,12 @@ publish-libs: if [ "$(IS_SNAPSHOT)" ]; then echo "publishing SNAPSHOT"; else echo "publishing release"; fi ./gradlew publish -.PHONY: ship-libs publish-lib +.PHONY: ship-libs publish-libs ifdef RELEASABLE_BRANCH # call for CI -ship-libs:: publish-lib +ship-libs:: publish-libs echo $@ success else