Skip to content

Commit 54fa958

Browse files
committed
Update sbt-github-actions to 0.24.0
1 parent 673aa3b commit 54fa958

File tree

4 files changed

+35
-42
lines changed

4 files changed

+35
-42
lines changed

.github/workflows/ci.yml

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,41 +28,37 @@ jobs:
2828
matrix:
2929
os: [ubuntu-latest]
3030
scala: [2.12.19, 2.13.13, 3.3.3]
31-
java: [graalvm-ce-java11@20.3.0]
31+
java: [graal_graalvm-community@17]
3232
runs-on: ${{ matrix.os }}
3333
steps:
3434
- name: Checkout current branch (full)
35-
uses: actions/checkout@v2
35+
uses: actions/checkout@v4
3636
with:
3737
fetch-depth: 0
3838

39-
- name: Setup Java and Scala
40-
uses: olafurpg/setup-scala@v13
39+
- name: Setup GraalVM (graal_graalvm-community@17)
40+
if: matrix.java == 'graal_graalvm-community@17'
41+
uses: graalvm/setup-graalvm@v1
4142
with:
42-
java-version: ${{ matrix.java }}
43+
java-version: 17
44+
distribution: graalvm-community
45+
components: native-image
46+
github-token: ${{ secrets.GITHUB_TOKEN }}
47+
cache: sbt
4348

44-
- name: Cache sbt
45-
uses: actions/cache@v2
46-
with:
47-
path: |
48-
~/.sbt
49-
~/.ivy2/cache
50-
~/.coursier/cache/v1
51-
~/.cache/coursier/v1
52-
~/AppData/Local/Coursier/Cache/v1
53-
~/Library/Caches/Coursier/v1
54-
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
49+
- name: Setup sbt
50+
uses: sbt/setup-sbt@v1
5551

5652
- name: Check that workflows are up to date
57-
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
53+
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
5854

59-
- run: sbt ++${{ matrix.scala }} test docs/mdoc mimaReportBinaryIssues
55+
- run: sbt '++ ${{ matrix.scala }}' test docs/mdoc mimaReportBinaryIssues
6056

6157
- name: Compress target directories
6258
run: tar cf targets.tar oauth2-jsoniter/jvm/target oauth2/js/target oauth2-cache/js/target oauth2-cache-ce2/target oauth2-cache-zio/target oauth2-jsoniter/js/target target oauth2-cache-scalacache/target mdoc/target oauth2-circe/jvm/target oauth2-cache-cats/target oauth2-cache-future/jvm/target oauth2-circe/js/target oauth2-cache/jvm/target oauth2-cache-future/js/target oauth2/jvm/target project/target
6359

6460
- name: Upload target directories
65-
uses: actions/upload-artifact@v2
61+
uses: actions/upload-artifact@v4
6662
with:
6763
name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
6864
path: targets.tar
@@ -75,33 +71,29 @@ jobs:
7571
matrix:
7672
os: [ubuntu-latest]
7773
scala: [2.13.13]
78-
java: [graalvm-ce-java11@20.3.0]
74+
java: [graal_graalvm-community@17]
7975
runs-on: ${{ matrix.os }}
8076
steps:
8177
- name: Checkout current branch (full)
82-
uses: actions/checkout@v2
78+
uses: actions/checkout@v4
8379
with:
8480
fetch-depth: 0
8581

86-
- name: Setup Java and Scala
87-
uses: olafurpg/setup-scala@v13
82+
- name: Setup GraalVM (graal_graalvm-community@17)
83+
if: matrix.java == 'graal_graalvm-community@17'
84+
uses: graalvm/setup-graalvm@v1
8885
with:
89-
java-version: ${{ matrix.java }}
86+
java-version: 17
87+
distribution: graalvm-community
88+
components: native-image
89+
github-token: ${{ secrets.GITHUB_TOKEN }}
90+
cache: sbt
9091

91-
- name: Cache sbt
92-
uses: actions/cache@v2
93-
with:
94-
path: |
95-
~/.sbt
96-
~/.ivy2/cache
97-
~/.coursier/cache/v1
98-
~/.cache/coursier/v1
99-
~/AppData/Local/Coursier/Cache/v1
100-
~/Library/Caches/Coursier/v1
101-
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
92+
- name: Setup sbt
93+
uses: sbt/setup-sbt@v1
10294

10395
- name: Download target directories (2.12.19)
104-
uses: actions/download-artifact@v2
96+
uses: actions/download-artifact@v4
10597
with:
10698
name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}
10799

@@ -111,7 +103,7 @@ jobs:
111103
rm targets.tar
112104
113105
- name: Download target directories (2.13.13)
114-
uses: actions/download-artifact@v2
106+
uses: actions/download-artifact@v4
115107
with:
116108
name: target-${{ matrix.os }}-2.13.13-${{ matrix.java }}
117109

@@ -121,7 +113,7 @@ jobs:
121113
rm targets.tar
122114
123115
- name: Download target directories (3.3.3)
124-
uses: actions/download-artifact@v2
116+
uses: actions/download-artifact@v4
125117
with:
126118
name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }}
127119

@@ -132,4 +124,4 @@ jobs:
132124
133125
- uses: olafurpg/setup-gpg@v3
134126

135-
- run: sbt ++${{ matrix.scala }} ci-release
127+
- run: sbt ci-release

.github/workflows/clean.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
steps:
1919
- name: Delete artifacts
20+
shell: bash {0}
2021
run: |
2122
# Customize those three lines with your repository and credentials:
2223
REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
@@ -25,7 +26,7 @@ jobs:
2526
ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
2627
2728
# A temporary file which receives HTTP response headers.
28-
TMPFILE=/tmp/tmp.$$
29+
TMPFILE=$(mktemp)
2930
3031
# An associative array, key: artifact name, value: number of artifacts of that name.
3132
declare -A ARTCOUNT

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ val GraalVM11 = "graalvm-ce-java11@20.3.0"
2727

2828
ThisBuild / scalaVersion := Scala213
2929
ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3)
30-
ThisBuild / githubWorkflowJavaVersions := Seq(GraalVM11)
30+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.graalvm(Graalvm.Distribution("graalvm-community"), "17"))
3131
ThisBuild / githubWorkflowBuild := Seq(
3232
WorkflowStep.Sbt(List("test", "docs/mdoc", "mimaReportBinaryIssues"))
3333
) // NOTE those run separately for every ScalaVersion in `crossScalaVersions`

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.3.3")
2-
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
2+
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0")
33
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
44
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
55
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")

0 commit comments

Comments
 (0)