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

* Update sbt-github-actions to 0.14.2 * update JVM vendor Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Brian Holt <[email protected]>
Dwolla · Dec 13, 2021 · c958fe8 · c958fe8
1 parent 2873eb9
commit c958fe8
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,18 +24,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.7, 2.12.15]
-        java: [adopt@1.8, adopt@1.11]
+        java: [temurin@8, temurin@11]
     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@11)
+        if: matrix.java == 'temurin@11'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -71,18 +80,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.7]
-        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@11)
+        if: matrix.java == 'temurin@11'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 11
 
       - name: Cache sbt
         uses: actions/cache@v2

diff --git a/.mergify.yml b/.mergify.yml
@@ -1,10 +1,10 @@
 queue_rules:
   - name: default
     conditions:
-      - status-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.8)
-      - status-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.11)
-      - status-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.8)
-      - status-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.11)
+      - status-success=Build and Test (ubuntu-latest, 2.13.7, temurin@8)
+      - status-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11)
+      - status-success=Build and Test (ubuntu-latest, 2.12.15, temurin@8)
+      - status-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11)
 
 pull_request_rules:
   - name: assign and label scala-steward's PRs
@@ -25,10 +25,10 @@ pull_request_rules:
   - name: merge scala-steward's PRs
     conditions:
       - author=scala-steward
-      - status-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.8)
-      - status-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.11)
-      - status-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.8)
-      - status-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.11)
+      - status-success=Build and Test (ubuntu-latest, 2.13.7, temurin@8)
+      - status-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11)
+      - status-success=Build and Test (ubuntu-latest, 2.12.15, temurin@8)
+      - status-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11)
     actions:
       queue:
         method: squash

diff --git a/build.sbt b/build.sbt
@@ -19,7 +19,7 @@ inThisBuild(List(
   resolvers += Resolver.sonatypeRepo("releases"),
 
   githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "doc"))),
-  githubWorkflowJavaVersions := Seq("[email protected]", "adopt@1.11"),
+  githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"), JavaSpec.temurin("11")),
   githubWorkflowTargetTags ++= Seq("v*"),
   githubWorkflowPublishTargetBranches :=
     Seq(RefPredicate.StartsWith(Ref.Tag("v"))),

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,7 +3,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0")
 addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.1.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
-addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
+addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
 
 addSbtPlugin("org.scalablytyped.converter" % "sbt-converter" % "1.0.0-beta36")