Skip to content

Commit 7cd2373

Browse files
mpilquistmpilquist
committed
Update GHA configuration
1 parent 7a29387 commit 7cd2373

File tree

3 files changed

+36
-27
lines changed

3 files changed

+36
-27
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,28 @@ concurrency:
2424

2525
jobs:
2626
build:
27-
name: Build and Test
27+
name: Test
2828
strategy:
2929
matrix:
30-
os: [ubuntu-latest]
30+
os: [ubuntu-22.04]
3131
scala: [3, 2.12, 2.13]
3232
java: [temurin@8]
3333
project: [rootJS, rootJVM, rootNative]
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
3636
steps:
3737
- name: Checkout current branch (full)
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v5
3939
with:
4040
fetch-depth: 0
4141

42+
- name: Setup sbt
43+
uses: sbt/setup-sbt@v1
44+
4245
- name: Setup Java (temurin@8)
4346
id: setup-java-temurin-8
4447
if: matrix.java == 'temurin@8'
45-
uses: actions/setup-java@v4
48+
uses: actions/setup-java@v5
4649
with:
4750
distribution: temurin
4851
java-version: 8
@@ -56,7 +59,7 @@ jobs:
5659
run: sbt githubWorkflowCheck
5760

5861
- name: Check headers and formatting
59-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
62+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
6063
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
6164

6265
- name: scalaJSLink
@@ -71,11 +74,11 @@ jobs:
7174
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
7275

7376
- name: Check binary compatibility
74-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
77+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
7578
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
7679

7780
- name: Generate API documentation
78-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
81+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
7982
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
8083

8184
- name: Make target directories
@@ -88,7 +91,7 @@ jobs:
8891

8992
- name: Upload target directories
9093
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
91-
uses: actions/upload-artifact@v4
94+
uses: actions/upload-artifact@v5
9295
with:
9396
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
9497
path: targets.tar
@@ -99,19 +102,22 @@ jobs:
99102
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
100103
strategy:
101104
matrix:
102-
os: [ubuntu-latest]
105+
os: [ubuntu-22.04]
103106
java: [temurin@8]
104107
runs-on: ${{ matrix.os }}
105108
steps:
106109
- name: Checkout current branch (full)
107-
uses: actions/checkout@v4
110+
uses: actions/checkout@v5
108111
with:
109112
fetch-depth: 0
110113

114+
- name: Setup sbt
115+
uses: sbt/setup-sbt@v1
116+
111117
- name: Setup Java (temurin@8)
112118
id: setup-java-temurin-8
113119
if: matrix.java == 'temurin@8'
114-
uses: actions/setup-java@v4
120+
uses: actions/setup-java@v5
115121
with:
116122
distribution: temurin
117123
java-version: 8
@@ -122,7 +128,7 @@ jobs:
122128
run: sbt +update
123129

124130
- name: Download target directories (3, rootJS)
125-
uses: actions/download-artifact@v4
131+
uses: actions/download-artifact@v6
126132
with:
127133
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS
128134

@@ -132,7 +138,7 @@ jobs:
132138
rm targets.tar
133139
134140
- name: Download target directories (3, rootJVM)
135-
uses: actions/download-artifact@v4
141+
uses: actions/download-artifact@v6
136142
with:
137143
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
138144

@@ -142,7 +148,7 @@ jobs:
142148
rm targets.tar
143149
144150
- name: Download target directories (3, rootNative)
145-
uses: actions/download-artifact@v4
151+
uses: actions/download-artifact@v6
146152
with:
147153
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
148154

@@ -152,7 +158,7 @@ jobs:
152158
rm targets.tar
153159
154160
- name: Download target directories (2.12, rootJS)
155-
uses: actions/download-artifact@v4
161+
uses: actions/download-artifact@v6
156162
with:
157163
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS
158164

@@ -162,7 +168,7 @@ jobs:
162168
rm targets.tar
163169
164170
- name: Download target directories (2.12, rootJVM)
165-
uses: actions/download-artifact@v4
171+
uses: actions/download-artifact@v6
166172
with:
167173
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
168174

@@ -172,7 +178,7 @@ jobs:
172178
rm targets.tar
173179
174180
- name: Download target directories (2.12, rootNative)
175-
uses: actions/download-artifact@v4
181+
uses: actions/download-artifact@v6
176182
with:
177183
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative
178184

@@ -182,7 +188,7 @@ jobs:
182188
rm targets.tar
183189
184190
- name: Download target directories (2.13, rootJS)
185-
uses: actions/download-artifact@v4
191+
uses: actions/download-artifact@v6
186192
with:
187193
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS
188194

@@ -192,7 +198,7 @@ jobs:
192198
rm targets.tar
193199
194200
- name: Download target directories (2.13, rootJVM)
195-
uses: actions/download-artifact@v4
201+
uses: actions/download-artifact@v6
196202
with:
197203
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
198204

@@ -202,7 +208,7 @@ jobs:
202208
rm targets.tar
203209
204210
- name: Download target directories (2.13, rootNative)
205-
uses: actions/download-artifact@v4
211+
uses: actions/download-artifact@v6
206212
with:
207213
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative
208214

@@ -237,22 +243,25 @@ jobs:
237243

238244
dependency-submission:
239245
name: Submit Dependencies
240-
if: github.event_name != 'pull_request'
246+
if: github.event.repository.fork == false && github.event_name != 'pull_request'
241247
strategy:
242248
matrix:
243-
os: [ubuntu-latest]
249+
os: [ubuntu-22.04]
244250
java: [temurin@8]
245251
runs-on: ${{ matrix.os }}
246252
steps:
247253
- name: Checkout current branch (full)
248-
uses: actions/checkout@v4
254+
uses: actions/checkout@v5
249255
with:
250256
fetch-depth: 0
251257

258+
- name: Setup sbt
259+
uses: sbt/setup-sbt@v1
260+
252261
- name: Setup Java (temurin@8)
253262
id: setup-java-temurin-8
254263
if: matrix.java == 'temurin@8'
255-
uses: actions/setup-java@v4
264+
uses: actions/setup-java@v5
256265
with:
257266
distribution: temurin
258267
java-version: 8

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.0
1+
sbt.version=1.11.7

‎project/plugins.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
val sbtTypelevelVersion = "0.7.1"
1+
val sbtTypelevelVersion = "0.8.3"
22
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
44
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
55
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
6-
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0")
6+
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.4.0")
77
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.10.0")
88
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")

0 commit comments

Comments
 (0)