Skip to content

Commit d40ff6f

Browse files
authored
Merge pull request #443 from typelevel/update/sbt-typelevel-0.7.5
Update sbt-typelevel, sbt-typelevel-site to 0.7.5
2 parents b2ec4fb + 4c9d0fa commit d40ff6f

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

.github/workflows/ci.yml

+20-20
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, 3, 2.13]
3232
java: [temurin@8, temurin@17]
3333
project: [rootJS, rootJVM, rootNative]
@@ -43,14 +43,14 @@ jobs:
4343
runs-on: ${{ matrix.os }}
4444
timeout-minutes: 60
4545
steps:
46-
- name: Install sbt
47-
uses: sbt/setup-sbt@v1
48-
4946
- name: Checkout current branch (full)
5047
uses: actions/checkout@v4
5148
with:
5249
fetch-depth: 0
5350

51+
- name: Setup sbt
52+
uses: sbt/setup-sbt@v1
53+
5454
- name: Setup Java (temurin@8)
5555
id: setup-java-temurin-8
5656
if: matrix.java == 'temurin@8'
@@ -81,7 +81,7 @@ jobs:
8181
run: sbt githubWorkflowCheck
8282

8383
- name: Check headers and formatting
84-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
84+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
8585
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
8686

8787
- name: scalaJSLink
@@ -96,11 +96,11 @@ jobs:
9696
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
9797

9898
- name: Check binary compatibility
99-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
99+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
100100
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
101101

102102
- name: Generate API documentation
103-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
103+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
104104
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
105105

106106
- name: Make target directories
@@ -124,18 +124,18 @@ jobs:
124124
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
125125
strategy:
126126
matrix:
127-
os: [ubuntu-latest]
127+
os: [ubuntu-22.04]
128128
java: [temurin@8]
129129
runs-on: ${{ matrix.os }}
130130
steps:
131-
- name: Install sbt
132-
uses: sbt/setup-sbt@v1
133-
134131
- name: Checkout current branch (full)
135132
uses: actions/checkout@v4
136133
with:
137134
fetch-depth: 0
138135

136+
- name: Setup sbt
137+
uses: sbt/setup-sbt@v1
138+
139139
- name: Setup Java (temurin@8)
140140
id: setup-java-temurin-8
141141
if: matrix.java == 'temurin@8'
@@ -281,18 +281,18 @@ jobs:
281281
if: github.event.repository.fork == false && github.event_name != 'pull_request'
282282
strategy:
283283
matrix:
284-
os: [ubuntu-latest]
284+
os: [ubuntu-22.04]
285285
java: [temurin@8]
286286
runs-on: ${{ matrix.os }}
287287
steps:
288-
- name: Install sbt
289-
uses: sbt/setup-sbt@v1
290-
291288
- name: Checkout current branch (full)
292289
uses: actions/checkout@v4
293290
with:
294291
fetch-depth: 0
295292

293+
- name: Setup sbt
294+
uses: sbt/setup-sbt@v1
295+
296296
- name: Setup Java (temurin@8)
297297
id: setup-java-temurin-8
298298
if: matrix.java == 'temurin@8'
@@ -329,18 +329,18 @@ jobs:
329329
name: Generate Site
330330
strategy:
331331
matrix:
332-
os: [ubuntu-latest]
332+
os: [ubuntu-22.04]
333333
java: [temurin@17]
334334
runs-on: ${{ matrix.os }}
335335
steps:
336-
- name: Install sbt
337-
uses: sbt/setup-sbt@v1
338-
339336
- name: Checkout current branch (full)
340337
uses: actions/checkout@v4
341338
with:
342339
fetch-depth: 0
343340

341+
- name: Setup sbt
342+
uses: sbt/setup-sbt@v1
343+
344344
- name: Setup Java (temurin@8)
345345
id: setup-java-temurin-8
346346
if: matrix.java == 'temurin@8'

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
22
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
33
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
44
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
5-
val sbtTypelevelVersion = "0.7.4"
5+
val sbtTypelevelVersion = "0.7.5"
66
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
77
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)

0 commit comments

Comments
 (0)