Skip to content

Commit a27514f

Browse files
committed
Update sbt-typelevel to get sbt back in CI
1 parent e52474f commit a27514f

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ 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: [2.12, 2.13, 3]
3232
java: [temurin@11]
3333
project: [diffsonJVM, diffsonJS, diffsonNative]
@@ -39,6 +39,9 @@ jobs:
3939
with:
4040
fetch-depth: 0
4141

42+
- name: Setup sbt
43+
uses: sbt/setup-sbt@v1
44+
4245
- name: Setup Java (temurin@11)
4346
id: setup-java-temurin-11
4447
if: matrix.java == 'temurin@11'
@@ -56,7 +59,7 @@ jobs:
5659
run: sbt githubWorkflowCheck
5760

5861
- name: Check headers and formatting
59-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
62+
if: matrix.java == 'temurin@11' && 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@11' && matrix.os == 'ubuntu-latest'
77+
if: matrix.java == 'temurin@11' && 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@11' && matrix.os == 'ubuntu-latest'
81+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
7982
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
8083

8184
- name: Make target directories
@@ -99,7 +102,7 @@ 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@11]
104107
runs-on: ${{ matrix.os }}
105108
steps:
@@ -108,6 +111,9 @@ jobs:
108111
with:
109112
fetch-depth: 0
110113

114+
- name: Setup sbt
115+
uses: sbt/setup-sbt@v1
116+
111117
- name: Setup Java (temurin@11)
112118
id: setup-java-temurin-11
113119
if: matrix.java == 'temurin@11'
@@ -237,10 +243,10 @@ 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@11]
245251
runs-on: ${{ matrix.os }}
246252
steps:
@@ -249,6 +255,9 @@ jobs:
249255
with:
250256
fetch-depth: 0
251257

258+
- name: Setup sbt
259+
uses: sbt/setup-sbt@v1
260+
252261
- name: Setup Java (temurin@11)
253262
id: setup-java-temurin-11
254263
if: matrix.java == 'temurin@11'
@@ -272,7 +281,7 @@ jobs:
272281
name: Validate Steward Config
273282
strategy:
274283
matrix:
275-
os: [ubuntu-latest]
284+
os: [ubuntu-22.04]
276285
java: [temurin@11]
277286
runs-on: ${{ matrix.os }}
278287
steps:

project/build.properties

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7")
1+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.0")
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
33
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
44
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")

0 commit comments

Comments
 (0)