Skip to content

Commit

Permalink
Changes in build script to check branch for proper packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
kevin-lee committed Oct 10, 2019
1 parent 4244972 commit 724ad98
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .build-scripts/build-project-simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .build-scripts/build-project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 724ad98

Please sign in to comment.