Skip to content

Commit 2de68df

Browse files
authored
Merge pull request #657 from scala-steward/update/sbt-typelevel-0.7.7
Update sbt-typelevel, sbt-typelevel-site to 0.7.7
2 parents 8ff5904 + 1c00ada commit 2de68df

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

Diff for: .github/workflows/ci.yml

+21-21
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ 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: [rootJS, rootJVM, rootNative]
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
3636
steps:
37-
- name: Install sbt
38-
uses: sbt/setup-sbt@v1
39-
4037
- name: Checkout current branch (full)
4138
uses: actions/checkout@v4
4239
with:
4340
fetch-depth: 0
4441

42+
- name: Setup sbt
43+
uses: sbt/setup-sbt@v1
44+
4545
- name: Setup Java (temurin@11)
4646
id: setup-java-temurin-11
4747
if: matrix.java == 'temurin@11'
@@ -59,7 +59,7 @@ jobs:
5959
run: sbt githubWorkflowCheck
6060

6161
- name: Check headers and formatting
62-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
62+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
6363
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
6464

6565
- name: scalaJSLink
@@ -74,11 +74,11 @@ jobs:
7474
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
7575

7676
- name: Check binary compatibility
77-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
77+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
7878
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
7979

8080
- name: Generate API documentation
81-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
81+
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
8282
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
8383

8484
- name: Make target directories
@@ -102,18 +102,18 @@ jobs:
102102
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
103103
strategy:
104104
matrix:
105-
os: [ubuntu-latest]
105+
os: [ubuntu-22.04]
106106
java: [temurin@11]
107107
runs-on: ${{ matrix.os }}
108108
steps:
109-
- name: Install sbt
110-
uses: sbt/setup-sbt@v1
111-
112109
- name: Checkout current branch (full)
113110
uses: actions/checkout@v4
114111
with:
115112
fetch-depth: 0
116113

114+
- name: Setup sbt
115+
uses: sbt/setup-sbt@v1
116+
117117
- name: Setup Java (temurin@11)
118118
id: setup-java-temurin-11
119119
if: matrix.java == 'temurin@11'
@@ -246,18 +246,18 @@ jobs:
246246
if: github.event.repository.fork == false && github.event_name != 'pull_request'
247247
strategy:
248248
matrix:
249-
os: [ubuntu-latest]
249+
os: [ubuntu-22.04]
250250
java: [temurin@11]
251251
runs-on: ${{ matrix.os }}
252252
steps:
253-
- name: Install sbt
254-
uses: sbt/setup-sbt@v1
255-
256253
- name: Checkout current branch (full)
257254
uses: actions/checkout@v4
258255
with:
259256
fetch-depth: 0
260257

258+
- name: Setup sbt
259+
uses: sbt/setup-sbt@v1
260+
261261
- name: Setup Java (temurin@11)
262262
id: setup-java-temurin-11
263263
if: matrix.java == 'temurin@11'
@@ -281,7 +281,7 @@ jobs:
281281
name: Validate Steward Config
282282
strategy:
283283
matrix:
284-
os: [ubuntu-latest]
284+
os: [ubuntu-22.04]
285285
java: [temurin@11]
286286
runs-on: ${{ matrix.os }}
287287
steps:
@@ -306,18 +306,18 @@ jobs:
306306
name: Generate Site
307307
strategy:
308308
matrix:
309-
os: [ubuntu-latest]
309+
os: [ubuntu-22.04]
310310
java: [temurin@11]
311311
runs-on: ${{ matrix.os }}
312312
steps:
313-
- name: Install sbt
314-
uses: sbt/setup-sbt@v1
315-
316313
- name: Checkout current branch (full)
317314
uses: actions/checkout@v4
318315
with:
319316
fetch-depth: 0
320317

318+
- name: Setup sbt
319+
uses: sbt/setup-sbt@v1
320+
321321
- name: Setup Java (temurin@11)
322322
id: setup-java-temurin-11
323323
if: matrix.java == 'temurin@11'

Diff for: project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4")
2-
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.4")
1+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7")
2+
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.7")
33

44
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
55

0 commit comments

Comments
 (0)