Skip to content

Commit a745072

Browse files
authored
Merge pull request #1086 from typelevel/update/sbt-typelevel-0.7.5
Update sbt-typelevel to 0.7.5
2 parents 8caa62b + f44e32d commit a745072

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 24 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: [3, 2.12, 2.13]
3232
java: [temurin@8, temurin@11]
3333
project: [rootJS, rootJVM, rootNative]
@@ -48,14 +48,14 @@ jobs:
4848
runs-on: ${{ matrix.os }}
4949
timeout-minutes: 60
5050
steps:
51-
- name: Install sbt
52-
uses: sbt/setup-sbt@v1
53-
5451
- name: Checkout current branch (full)
5552
uses: actions/checkout@v4
5653
with:
5754
fetch-depth: 0
5855

56+
- name: Setup sbt
57+
uses: sbt/setup-sbt@v1
58+
5959
- name: Setup Java (temurin@8)
6060
id: setup-java-temurin-8
6161
if: matrix.java == 'temurin@8'
@@ -86,7 +86,7 @@ jobs:
8686
run: sbt githubWorkflowCheck
8787

8888
- name: Check headers and formatting
89-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' && matrix.workers == '1'
89+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' && matrix.workers == '1'
9090
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
9191

9292
- name: scalaJSLink
@@ -101,11 +101,11 @@ jobs:
101101
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
102102

103103
- name: Check binary compatibility
104-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' && matrix.workers == '1'
104+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' && matrix.workers == '1'
105105
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
106106

107107
- name: Generate API documentation
108-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' && matrix.workers == '1'
108+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' && matrix.workers == '1'
109109
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
110110

111111
- name: Make target directories
@@ -129,18 +129,18 @@ jobs:
129129
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
130130
strategy:
131131
matrix:
132-
os: [ubuntu-latest]
132+
os: [ubuntu-22.04]
133133
java: [temurin@8]
134134
runs-on: ${{ matrix.os }}
135135
steps:
136-
- name: Install sbt
137-
uses: sbt/setup-sbt@v1
138-
139136
- name: Checkout current branch (full)
140137
uses: actions/checkout@v4
141138
with:
142139
fetch-depth: 0
143140

141+
- name: Setup sbt
142+
uses: sbt/setup-sbt@v1
143+
144144
- name: Setup Java (temurin@8)
145145
id: setup-java-temurin-8
146146
if: matrix.java == 'temurin@8'
@@ -286,18 +286,18 @@ jobs:
286286
if: github.event.repository.fork == false && github.event_name != 'pull_request'
287287
strategy:
288288
matrix:
289-
os: [ubuntu-latest]
289+
os: [ubuntu-22.04]
290290
java: [temurin@8]
291291
runs-on: ${{ matrix.os }}
292292
steps:
293-
- name: Install sbt
294-
uses: sbt/setup-sbt@v1
295-
296293
- name: Checkout current branch (full)
297294
uses: actions/checkout@v4
298295
with:
299296
fetch-depth: 0
300297

298+
- name: Setup sbt
299+
uses: sbt/setup-sbt@v1
300+
301301
- name: Setup Java (temurin@8)
302302
id: setup-java-temurin-8
303303
if: matrix.java == 'temurin@8'
@@ -334,18 +334,18 @@ jobs:
334334
name: Examples
335335
strategy:
336336
matrix:
337-
os: [ubuntu-latest]
337+
os: [ubuntu-22.04]
338338
java: [temurin@8]
339339
runs-on: ${{ matrix.os }}
340340
steps:
341-
- name: Install sbt
342-
uses: sbt/setup-sbt@v1
343-
344341
- name: Checkout current branch (full)
345342
uses: actions/checkout@v4
346343
with:
347344
fetch-depth: 0
348345

346+
- name: Setup sbt
347+
uses: sbt/setup-sbt@v1
348+
349349
- name: Setup Java (temurin@8)
350350
id: setup-java-temurin-8
351351
if: matrix.java == 'temurin@8'
@@ -381,18 +381,18 @@ jobs:
381381
name: Bench
382382
strategy:
383383
matrix:
384-
os: [ubuntu-latest]
384+
os: [ubuntu-22.04]
385385
java: [temurin@8]
386386
runs-on: ${{ matrix.os }}
387387
steps:
388-
- name: Install sbt
389-
uses: sbt/setup-sbt@v1
390-
391388
- name: Checkout current branch (full)
392389
uses: actions/checkout@v4
393390
with:
394391
fetch-depth: 0
395392

393+
- name: Setup sbt
394+
uses: sbt/setup-sbt@v1
395+
396396
- name: Setup Java (temurin@8)
397397
id: setup-java-temurin-8
398398
if: matrix.java == 'temurin@8'

project/plugin.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
22
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6")
33
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
4-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4")
4+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.5")

0 commit comments

Comments
 (0)