Merge pull request #91 from Kevin-Lee/change-build-script

Changes in build script to check branch for proper packaging
kevin-lee · Oct 10, 2019 · b6a7803 · b6a7803
2 parents 4244972 + 724ad98
commit b6a7803
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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