Updated: GitHub Actions config and build script files

kevin-lee · Nov 3, 2020 · 13c3054 · 13c3054
1 parent a1152f0
commit 13c3054
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,16 +21,22 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_AUTH_TOKEN }}
       run: |
         echo "Run] sbt GitHub release"
-        echo 'sbt -J-Xmx2048m "; clean; test; packagedArtifacts; gitHubRelease"'
-        sbt -J-Xmx2048m "; clean; test; packagedArtifacts; gitHubRelease"
+        echo 'sbt -J-Xmx2048m clean test packagedArtifacts gitHubRelease'
+        sbt -J-Xmx2048m \
+          clean \
+          test \
+          packagedArtifacts \
+          gitHubRelease
     - name: sbt Publish
       env:
         BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
         BINTRAY_PASS: ${{ secrets.BINTRAY_PASS }}
       run: |
         echo "Run] sbt publish"
-        echo 'sbt -J-Xmx2048m "; clean; publish"'
-        sbt -J-Xmx2048m "; clean; publish"
+        echo 'sbt -J-Xmx2048m clean publish'
+        sbt -J-Xmx2048m \
+          clean \
+          publish
 
     - name: Sync to Maven Central
       env:

diff --git a/.github/workflows/sbt-build.sh b/.github/workflows/sbt-build.sh
@@ -5,7 +5,7 @@ set -x
 if [ -z "$1" ]
   then
     echo "Scala version is missing. Please enter the Scala version."
-    echo "sbt-build.sh 2.11.12"
+    echo "sbt-build.sh 2.13.3"
     exit 1
 else
   SCALA_VERSION=$1
@@ -15,12 +15,26 @@ else
   echo ""
   if [[ "$CI_BRANCH" == "main" || "$CI_BRANCH" == "release" ]]
   then
-    sbt -d -J-Xmx2048m "; ++ ${SCALA_VERSION}!; clean; jacoco"
-    sbt -d -J-Xmx2048m "; ++ ${SCALA_VERSION}!; packagedArtifacts"
+    sbt -d -J-Xmx2048m \
+      ++${SCALA_VERSION}! \
+      test \
+      clean \
+      test \
+      jacoco
+    sbt -d -J-Xmx2048m \
+      ++${SCALA_VERSION}! \
+      packagedArtifacts
   else
-    sbt -d -J-Xmx2048m "; ++ ${SCALA_VERSION}!; clean; jacoco; package"
+    sbt -d -J-Xmx2048m \
+      ++${SCALA_VERSION}! \
+      clean \
+      test \
+      jacoco \
+      package
   fi
-  sbt -d -J-Xmx2048m "; ++ ${SCALA_VERSION}!; jacocoCoveralls"
+  sbt -d -J-Xmx2048m \
+    ++${SCALA_VERSION}! \
+    jacocoCoveralls
 
   echo "============================================"
   echo "Building projects: Done"