Skip to content

Commit

Permalink
fix: ship-libs depended on publish-lib without s, make BUILD_VERSION …
Browse files Browse the repository at this point in the history
…puVar
  • Loading branch information
basejump committed Jul 22, 2021
1 parent 07b1c94 commit c00de9b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions bin/init_env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions makefiles/spring-gradle.make
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit c00de9b

Please sign in to comment.