Update sbt-github-actions to 0.14.2 (#835)

* Update sbt-github-actions to 0.14.2 * cross-build against the oldest and the latest LTS JDK Co-authored-by: catostrophe <40268503+catostrophe@users.noreply.github.com>
tofu-tf · Dec 5, 2021 · ed141b8 · ed141b8
1 parent e6637aa
commit ed141b8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 14 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -20,10 +20,10 @@ pull_request_rules:
           - body~=labels:.*semver-patch
           - "#approved-reviews-by>=1"
       - and:
-          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\)
-          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\)
-          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\)
-          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\)
+          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, temurin@8\)
+          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, temurin@17\)
+          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, temurin@8\)
+          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, temurin@17\)
     actions:
       merge:
         method: rebase

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,18 +25,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.6, 2.12.15]
-        java: [adopt@1.8, adopt@1.11]
+        java: [temurin@8, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 8
+
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 17
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -80,18 +89,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.6]
-        java: [adopt@1.8]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 8
+
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 17
 
       - name: Cache sbt
         uses: actions/cache@v2

diff --git a/ci-release.sbt b/ci-release.sbt
@@ -12,7 +12,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq(
   RefPredicate.StartsWith(Ref.Tag("v"))
 )
 
-ThisBuild / githubWorkflowJavaVersions          := Seq("adopt@1.8", "adopt@1.11")
+ThisBuild / githubWorkflowJavaVersions          := Seq(JavaSpec.temurin("8"), JavaSpec.temurin("17"))
 
 ThisBuild / githubWorkflowBuildPreamble += WorkflowStep.Sbt(
   List("scalafmtCheckAll", "scalafmtSbtCheck"),

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -20,7 +20,7 @@ addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.0")
 
-addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
+addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")