From 724ad989f7025d05ca081121a26264ba344f1ecd Mon Sep 17 00:00:00 2001 From: Kevin Lee Date: Thu, 10 Oct 2019 19:25:47 +1100 Subject: [PATCH] Changes in build script to check branch for proper packaging --- .build-scripts/build-project-simple.sh | 4 ++-- .build-scripts/build-project.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.build-scripts/build-project-simple.sh b/.build-scripts/build-project-simple.sh index ae1ccf6..bf8ab07 100755 --- a/.build-scripts/build-project-simple.sh +++ b/.build-scripts/build-project-simple.sh @@ -12,10 +12,10 @@ else echo "Build projects" echo "--------------------------------------------" echo "" - if [[ "$BRANCH_NAME" == "rc" ]] + if [[ "$BRANCH_NAME" == "master" || "$BRANCH_NAME" == "release" ]] then sbt -d -J-Xmx2048m "; ++ ${scala_version}!; clean; test" - sbt -d -J-Xmx2048m "; ++ ${scala_version}!; packageBin; packageSrc; packageDoc" + sbt -d -J-Xmx2048m "; ++ ${scala_version}!; packagedArtifacts" else sbt -d -J-Xmx2048m "; ++ ${scala_version}!; clean; test; package" fi diff --git a/.build-scripts/build-project.sh b/.build-scripts/build-project.sh index 037efd5..994d95e 100755 --- a/.build-scripts/build-project.sh +++ b/.build-scripts/build-project.sh @@ -12,10 +12,10 @@ else echo "Build projects" echo "--------------------------------------------" echo "" - if [[ "$BRANCH_NAME" == "rc" ]] + if [[ "$BRANCH_NAME" == "master" || "$BRANCH_NAME" == "release" ]] then sbt -d -J-Xmx2048m "; ++ ${scala_version}!; clean; coverage; test; coverageReport; coverageAggregate" - sbt -d -J-Xmx2048m "; ++ ${scala_version}!; packageBin; packageSrc; packageDoc" + sbt -d -J-Xmx2048m "; ++ ${scala_version}!; packagedArtifacts" else sbt -d -J-Xmx2048m "; ++ ${scala_version}!; clean; coverage; test; coverageReport; coverageAggregate; package" fi