Skip to content

Commit dfc23d3

Browse files
authored
Merge pull request #3513 from typelevel/update/sbt-typelevel-0.7.5
Update sbt-typelevel, sbt-typelevel-site to 0.7.5
2 parents ccc3658 + e6041e9 commit dfc23d3

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.github/workflows/ci.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ concurrency:
2424

2525
jobs:
2626
build:
27-
name: Build and Test
27+
name: Test
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest]
@@ -34,14 +34,14 @@ jobs:
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@17)
4646
id: setup-java-temurin-17
4747
if: matrix.java == 'temurin@17'
@@ -116,14 +116,14 @@ jobs:
116116
java: [temurin@17]
117117
runs-on: ${{ matrix.os }}
118118
steps:
119-
- name: Install sbt
120-
uses: sbt/setup-sbt@v1
121-
122119
- name: Checkout current branch (full)
123120
uses: actions/checkout@v4
124121
with:
125122
fetch-depth: 0
126123

124+
- name: Setup sbt
125+
uses: sbt/setup-sbt@v1
126+
127127
- name: Setup Java (temurin@17)
128128
id: setup-java-temurin-17
129129
if: matrix.java == 'temurin@17'
@@ -256,18 +256,18 @@ jobs:
256256
if: github.event.repository.fork == false && github.event_name != 'pull_request'
257257
strategy:
258258
matrix:
259-
os: [ubuntu-latest]
259+
os: [ubuntu-22.04]
260260
java: [temurin@17]
261261
runs-on: ${{ matrix.os }}
262262
steps:
263-
- name: Install sbt
264-
uses: sbt/setup-sbt@v1
265-
266263
- name: Checkout current branch (full)
267264
uses: actions/checkout@v4
268265
with:
269266
fetch-depth: 0
270267

268+
- name: Setup sbt
269+
uses: sbt/setup-sbt@v1
270+
271271
- name: Setup Java (temurin@17)
272272
id: setup-java-temurin-17
273273
if: matrix.java == 'temurin@17'
@@ -296,14 +296,14 @@ jobs:
296296
project: [ioJS, ioJVM, ioNative]
297297
runs-on: ${{ matrix.os }}
298298
steps:
299-
- name: Install sbt
300-
uses: sbt/setup-sbt@v1
301-
302299
- name: Checkout current branch (full)
303300
uses: actions/checkout@v4
304301
with:
305302
fetch-depth: 0
306303

304+
- name: Setup sbt
305+
uses: sbt/setup-sbt@v1
306+
307307
- name: Setup Java (temurin@17)
308308
id: setup-java-temurin-17
309309
if: matrix.java == 'temurin@17'
@@ -326,18 +326,18 @@ jobs:
326326
name: Generate Site
327327
strategy:
328328
matrix:
329-
os: [ubuntu-latest]
329+
os: [ubuntu-22.04]
330330
java: [temurin@17]
331331
runs-on: ${{ matrix.os }}
332332
steps:
333-
- name: Install sbt
334-
uses: sbt/setup-sbt@v1
335-
336333
- name: Checkout current branch (full)
337334
uses: actions/checkout@v4
338335
with:
339336
fetch-depth: 0
340337

338+
- name: Setup sbt
339+
uses: sbt/setup-sbt@v1
340+
341341
- name: Setup Java (temurin@17)
342342
id: setup-java-temurin-17
343343
if: matrix.java == 'temurin@17'

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val sbtTypelevelVersion = "0.7.4"
1+
val sbtTypelevelVersion = "0.7.5"
22
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
33
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
44
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")

0 commit comments

Comments
 (0)