Skip to content

Commit 85d178e

Browse files
authored
Merge pull request #1042 from scala-steward/update/sbt-github-actions-0.14.1
Update sbt-github-actions to 0.14.1
2 parents 2b6a81d + 9387594 commit 85d178e

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,20 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest]
2626
scala: [2.12.15, 2.13.7, 3.1.0]
27-
java: [adopt@1.8]
27+
java: [adopt-hotspot@8]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout current branch (full)
3131
uses: actions/checkout@v2
3232
with:
3333
fetch-depth: 0
3434

35-
- name: Setup Java and Scala
36-
uses: olafurpg/setup-scala@v13
35+
- name: Setup Java (adopt-hotspot@8)
36+
if: matrix.java == 'adopt-hotspot@8'
37+
uses: actions/setup-java@v2
3738
with:
38-
java-version: ${{ matrix.java }}
39+
distribution: adopt-hotspot
40+
java-version: 8
3941

4042
- name: Cache sbt
4143
uses: actions/cache@v2
@@ -80,18 +82,20 @@ jobs:
8082
matrix:
8183
os: [ubuntu-latest]
8284
scala: [2.12.14]
83-
java: [adopt@1.8]
85+
java: [adopt-hotspot@8]
8486
runs-on: ${{ matrix.os }}
8587
steps:
8688
- name: Checkout current branch (full)
8789
uses: actions/checkout@v2
8890
with:
8991
fetch-depth: 0
9092

91-
- name: Setup Java and Scala
92-
uses: olafurpg/setup-scala@v13
93+
- name: Setup Java (adopt-hotspot@8)
94+
if: matrix.java == 'adopt-hotspot@8'
95+
uses: actions/setup-java@v2
9396
with:
94-
java-version: ${{ matrix.java }}
97+
distribution: adopt-hotspot
98+
java-version: 8
9599

96100
- name: Cache sbt
97101
uses: actions/cache@v2

.mergify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ pull_request_rules:
1010
- name: automatically merge scala-steward's PRs
1111
conditions:
1212
- author=scala-steward
13-
- status-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.8)
14-
- status-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.8)
15-
- status-success=Build and Test (ubuntu-latest, 3.1.0, adopt@1.8)
13+
- status-success=Build and Test (ubuntu-latest, 2.12.15, adopt-hotspot@8)
14+
- status-success=Build and Test (ubuntu-latest, 2.13.7, adopt-hotspot@8)
15+
- status-success=Build and Test (ubuntu-latest, 3.1.0, adopt-hotspot@8)
1616
- body~=labels:.*semver-spec-patch
1717
actions:
1818
merge:

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import sbtcrossproject.CrossProject
22
import sbtcrossproject.Platform
3+
import sbtghactions.JavaSpec.Distribution.Adopt
34

45
/// variables
56

@@ -97,7 +98,7 @@ ThisBuild / githubWorkflowPublish := Seq(
9798
)
9899
)
99100
)
100-
ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8")
101+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Adopt, "8"))
101102
ThisBuild / githubWorkflowBuild :=
102103
Seq(
103104
WorkflowStep.Sbt(

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
1+
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.1")
22

33
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
44

0 commit comments

Comments
 (0)