Merge pull request #179 from Kevin-Lee/upgrade-sbt

Upgraded: sbt 1.3.13 => 1.4.3
kevin-lee · Nov 19, 2020 · c3d08d4 · c3d08d4
2 parents 056e380 + 2c7ab99
commit c3d08d4
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 33 deletions.
diff --git a/.github/workflows/maven_central_sync.sh b/.github/workflows/maven_central_sync.sh
@@ -0,0 +1,30 @@
+#!/bin/bash -e
+
+if [ "${GITHUB_TAG:-}" != "" ]; then
+
+  : ${BINTRAY_USER:?"BINTRAY_USER is missing."}
+  : ${BINTRAY_PASS:?"BINTRAY_PASS is missing."}
+
+  PROJECT_VERSION="${GITHUB_TAG#v}"
+  BINTRAY_SUBJECT=${BINTRAY_SUBJECT:-kevinlee}
+  BINTRAY_REPO=${BINTRAY_REPO:-maven}
+
+  echo "PROJECT_VERSION: $PROJECT_VERSION"
+  echo "BINTRAY_SUBJECT: $BINTRAY_SUBJECT"
+  echo "   BINTRAY_REPO: $BINTRAY_REPO"
+  BINTRAY_PACKAGES="just-fp-core"
+  for bintray_package in $BINTRAY_PACKAGES
+  do
+    echo ""
+    echo "bintray_package: $bintray_package - Sync to Maven Central..."
+    curl \
+      --user "$BINTRAY_USER:$BINTRAY_PASS" \
+      -X POST \
+      -H "Content-Type: application/json" \
+      "https://api.bintray.com/maven_central_sync/$BINTRAY_SUBJECT/$BINTRAY_REPO/$bintray_package/versions/$PROJECT_VERSION"
+
+    sleep 10s
+  done
+else
+  echo "It's not a tag release so 'Sync to Maven Central' has been skipped."
+fi
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,37 +9,111 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: "11"
+
+      - name: Cache Coursier
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/coursier
+          key: ${{ runner.os }}-coursier-scala-${{ matrix.scala.binary-version }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-coursier-scala-${{ matrix.scala.binary-version }}-
+
+      - name: Cache Ivy
+        uses: actions/cache@v1
+        with:
+          path: ~/.ivy2/cache
+          key: ${{ runner.os }}-ivy-scala-${{ matrix.scala.binary-version }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-ivy-scala-${{ matrix.scala.binary-version }}-
+
+      - name: sbt GitHub Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.RELEASE_AUTH_TOKEN_GITHUB }}
+        run: |
+          echo "Run] sbt GitHub release"
+          echo "mkdir -p dotty-docs"
+          mkdir -p dotty-docs
+          export SOURCE_DATE_EPOCH=$(($(date +%s%N)/1000000))
+          echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
+          echo 'sbt -J-Xmx2048m clean +test +packagedArtifacts gitHubRelease'
+          sbt \
+            -J-Xmx2048m \
+            clean \
+            +test \
+            +packagedArtifacts \
+            gitHubRelease
+
+  publish:
+    needs: build
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        scala:
+          - { name: "Scala 2", version: "2.11.12", binary-version: "2.11", java-version: "8" }
+          - { name: "Scala 2", version: "2.12.12", binary-version: "2.12", java-version: "11" }
+          - { name: "Scala 2", version: "2.13.3",  binary-version: "2.13", java-version: "11" }
+          - { name: "Scala 3", version: "3.0.0-M1",  binary-version: "3.0.0-M1", java-version: "11" }
 
     steps:
-    - uses: actions/checkout@v1
-    - name: sbt GitHub Release
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_AUTH_TOKEN }}
-      run: |
-        echo "Run] sbt GitHub release"
-        echo 'sbt -J-Xmx2048m "; project core; clean; +test; +packagedArtifacts; gitHubRelease"'
-        sbt -J-Xmx2048m "; project core; clean; +test; +packagedArtifacts; gitHubRelease"
-    - name: sbt Publish
-      env:
-        BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-        BINTRAY_PASS: ${{ secrets.BINTRAY_PASS }}
-      run: |
-        echo "Run] sbt GitHub release"
-        echo 'sbt -J-Xmx2048m "; project core; clean; +publish"'
-        sbt -J-Xmx2048m "; project core; clean; +publish"
-    - name: Sync to Maven Central
-      env:
-        BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
-        BINTRAY_PASS: ${{ secrets.BINTRAY_PASS }}
-      run: |
-        PROJECT_VERSION="${GITHUB_REF#refs/tags/v}"
-        BINTRAY_SUBJECT=kevinlee
-        BINTRAY_REPO=maven
-        BINTRAY_PACKAGE=just-fp-core
-        echo "BINTRAY_SUBJECT: $BINTRAY_SUBJECT"
-        echo "   BINTRAY_REPO: $BINTRAY_REPO"
-        echo "BINTRAY_PACKAGE: $BINTRAY_PACKAGE"
-        echo "PROJECT_VERSION: $PROJECT_VERSION"
-# Uncomment once Bintray is connected to JCenter
-#        echo "Sync to Maven Central..."
-#        curl --user $BINTRAY_USER:$BINTRAY_PASS -X POST "https://api.bintray.com/maven_central_sync/$BINTRAY_SUBJECT/$BINTRAY_REPO/$BINTRAY_PACKAGE/versions/$PROJECT_VERSION"
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.scala.java-version }}
+
+      - name: Cache Coursier
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/coursier
+          key: ${{ runner.os }}-coursier-scala-${{ matrix.scala.binary-version }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-coursier-scala-${{ matrix.scala.binary-version }}-
+
+      - name: Cache Ivy
+        uses: actions/cache@v1
+        with:
+          path: ~/.ivy2/cache
+          key: ${{ runner.os }}-ivy-scala-${{ matrix.scala.binary-version }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-ivy-scala-${{ matrix.scala.binary-version }}-
+
+      - name: "sbt Publish for ${{ matrix.scala.name }} ${{ matrix.scala.version }} - ${{ github.run_number }}"
+        env:
+          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+          BINTRAY_PASS: ${{ secrets.BINTRAY_PASS }}
+        run: |
+          echo "Run] sbt publish All for Scala ${{ matrix.scala.version }}"
+          echo "mkdir -p dotty-docs"
+          mkdir -p dotty-docs
+          export SOURCE_DATE_EPOCH=$(($(date +%s%N)/1000000))
+          echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
+          echo 'sbt -J-Xmx2048m ++${{ matrix.scala.version }}! -v clean publish'
+          sbt \
+            -J-Xmx2048m \
+            ++${{ matrix.scala.version }}! \
+            -v \
+            clean \
+            publish
+
+  publish_maven:
+    needs: publish
+    if: startsWith(github.ref, 'refs/tags/v')
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Sync to Maven Central
+        env:
+          BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
+          BINTRAY_PASS: ${{ secrets.BINTRAY_PASS }}
+        run: |
+          export GITHUB_TAG=${GITHUB_REF#refs/tags/}
+          .github/workflows/maven_central_sync.sh
diff --git a/.github/workflows/sbt-build-all.sh b/.github/workflows/sbt-build-all.sh
@@ -15,6 +15,8 @@ else
   echo "Build projects"
   echo "--------------------------------------------"
   echo ""
+  export SOURCE_DATE_EPOCH=$(($(date +%s%N)/1000000))
+  echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
 
   if [[ "$CURRENT_BRANCH_NAME" == "main" || "$CURRENT_BRANCH_NAME" == "release" ]]
   then

diff --git a/.github/workflows/sbt-build.sh b/.github/workflows/sbt-build.sh
@@ -16,6 +16,9 @@ else
   echo "Build projects"
   echo "--------------------------------------------"
   echo ""
+  export SOURCE_DATE_EPOCH=$(($(date +%s%N)/1000000))
+  echo "SOURCE_DATE_EPOCH=$SOURCE_DATE_EPOCH"
+
   if [[ "$CURRENT_BRANCH_NAME" == "main" || "$CURRENT_BRANCH_NAME" == "release" ]]
   then
     sbt -J-Xmx2048m "project ${project_name}" ++${scala_version}! clean coverage test coverageReport coverageAggregate

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.2
+sbt.version=1.4.3