Skip to content

Commit 2f3cfee

Browse files
committed
Update sbt-github-actions to 0.14.2
1 parent e24acf8 commit 2f3cfee

File tree

5 files changed

+36
-18
lines changed

5 files changed

+36
-18
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ name: Continuous Integration
99

1010
on:
1111
pull_request:
12-
branches: ['*']
12+
branches: ['**']
1313
push:
14-
branches: ['*']
14+
branches: ['**']
1515
tags: [v*]
1616

1717
env:
@@ -25,18 +25,27 @@ jobs:
2525
matrix:
2626
os: [ubuntu-latest]
2727
scala: [2.13.10, 2.12.17]
28-
java: [graalvm-ce-java11@21.1.0, openjdk@1.17]
28+
java: [graal_21.1.0@11, temurin@17]
2929
runs-on: ${{ matrix.os }}
3030
steps:
3131
- name: Checkout current branch (full)
3232
uses: actions/checkout@v2
3333
with:
3434
fetch-depth: 0
3535

36-
- name: Setup Java and Scala
37-
uses: olafurpg/setup-scala@v10
36+
- name: Setup GraalVM (graal_21.1.0@11)
37+
if: matrix.java == 'graal_21.1.0@11'
38+
uses: DeLaGuardo/setup-graalvm@5.0
3839
with:
39-
java-version: ${{ matrix.java }}
40+
graalvm: 21.1.0
41+
java: java11
42+
43+
- name: Setup Java (temurin@17)
44+
if: matrix.java == 'temurin@17'
45+
uses: actions/setup-java@v2
46+
with:
47+
distribution: temurin
48+
java-version: 17
4049

4150
- name: Cache sbt
4251
uses: actions/cache@v2
@@ -93,18 +102,27 @@ jobs:
93102
matrix:
94103
os: [ubuntu-latest]
95104
scala: [2.13.10]
96-
java: [graalvm-ce-java11@21.1.0]
105+
java: [graal_21.1.0@11]
97106
runs-on: ${{ matrix.os }}
98107
steps:
99108
- name: Checkout current branch (full)
100109
uses: actions/checkout@v2
101110
with:
102111
fetch-depth: 0
103112

104-
- name: Setup Java and Scala
105-
uses: olafurpg/setup-scala@v10
113+
- name: Setup GraalVM (graal_21.1.0@11)
114+
if: matrix.java == 'graal_21.1.0@11'
115+
uses: DeLaGuardo/setup-graalvm@5.0
116+
with:
117+
graalvm: 21.1.0
118+
java: java11
119+
120+
- name: Setup Java (temurin@17)
121+
if: matrix.java == 'temurin@17'
122+
uses: actions/setup-java@v2
106123
with:
107-
java-version: ${{ matrix.java }}
124+
distribution: temurin
125+
java-version: 17
108126

109127
- name: Cache sbt
110128
uses: actions/cache@v2
@@ -143,4 +161,4 @@ jobs:
143161
PGP_SECRET: ${{ secrets.PGP_SECRET }}
144162
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
145163
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
146-
run: sbt ++${{ matrix.scala }} ci-release
164+
run: sbt ++${{ matrix.scala }} ci-release

.github/workflows/clean.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ jobs:
5656
printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size
5757
ghapi -X DELETE $REPO/actions/artifacts/$id
5858
done
59-
done
59+
done

project/Build.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,23 @@ object Build extends BuildDef {
9292
githubWorkflowEnv ++= Map(
9393
"REDIS_VERSION" -> "6.2.6",
9494
),
95-
githubWorkflowJavaVersions := Seq("graalvm-ce-java11@21.1.0", "openjdk@1.17"),
95+
githubWorkflowJavaVersions := Seq(JavaSpec.graalvm("21.1.0", "11"), JavaSpec.temurin("17")),
9696
githubWorkflowBuildPreamble ++= Seq(
9797
WorkflowStep.Use(
98-
"actions", "cache", "v2",
98+
UseRef.Public("actions", "cache", "v2"),
9999
name = Some("Cache Redis"),
100100
params = Map(
101101
"path" -> "./redis-${{ env.REDIS_VERSION }}",
102102
"key" -> "${{ runner.os }}-redis-cache-v2-${{ env.REDIS_VERSION }}"
103103
)
104104
),
105105
WorkflowStep.Use(
106-
"actions", "setup-node", "v2",
106+
UseRef.Public("actions", "setup-node", "v2"),
107107
name = Some("Setup Node.js"),
108108
params = Map("node-version" -> "12")
109109
),
110110
WorkflowStep.Use(
111-
"supercharge", "mongodb-github-action", "1.7.0",
111+
UseRef.Public("supercharge", "mongodb-github-action", "1.7.0"),
112112
name = Some("Setup MongoDB"),
113113
params = Map(
114114
"mongodb-version" -> "5.0.8",

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# suppress inspection "UnusedProperty"
2-
sbt.version=1.8.0
2+
sbt.version=1.8.2

project/project/BuildBuild.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object BuildBuild extends AutoPlugin {
2121
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2"),
2222
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.2"),
2323
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.8"),
24-
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.9.5"),
24+
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2"),
2525
)
2626

2727
lazy val macros = project

0 commit comments

Comments
 (0)