Skip to content

Commit c03b1cd

Browse files
authored
Merge pull request #1361 from typelevel/update/sbt-typelevel-0.7.7
2 parents 4a70e3a + 3e79c52 commit c03b1cd

2 files changed

Lines changed: 21 additions & 21 deletions

File tree

.github/workflows/ci.yml

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

55+
- name: Setup sbt
56+
uses: sbt/setup-sbt@v1
57+
5858
- name: Setup Java (temurin@8)
5959
id: setup-java-temurin-8
6060
if: matrix.java == 'temurin@8'
@@ -98,7 +98,7 @@ jobs:
9898
run: sbt githubWorkflowCheck
9999

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

104104
- name: scalaJSLink
@@ -113,11 +113,11 @@ jobs:
113113
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
114114

115115
- name: Check binary compatibility
116-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
116+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
117117
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
118118

119119
- name: Generate API documentation
120-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
120+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
121121
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
122122

123123
- name: Make target directories
@@ -141,18 +141,18 @@ jobs:
141141
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
142142
strategy:
143143
matrix:
144-
os: [ubuntu-latest]
144+
os: [ubuntu-22.04]
145145
java: [temurin@8]
146146
runs-on: ${{ matrix.os }}
147147
steps:
148-
- name: Install sbt
149-
uses: sbt/setup-sbt@v1
150-
151148
- name: Checkout current branch (full)
152149
uses: actions/checkout@v4
153150
with:
154151
fetch-depth: 0
155152

153+
- name: Setup sbt
154+
uses: sbt/setup-sbt@v1
155+
156156
- name: Setup Java (temurin@8)
157157
id: setup-java-temurin-8
158158
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'
@@ -342,18 +342,18 @@ jobs:
342342
name: Generate Site
343343
strategy:
344344
matrix:
345-
os: [ubuntu-latest]
345+
os: [ubuntu-22.04]
346346
java: [temurin@11]
347347
runs-on: ${{ matrix.os }}
348348
steps:
349-
- name: Install sbt
350-
uses: sbt/setup-sbt@v1
351-
352349
- name: Checkout current branch (full)
353350
uses: actions/checkout@v4
354351
with:
355352
fetch-depth: 0
356353

354+
- name: Setup sbt
355+
uses: sbt/setup-sbt@v1
356+
357357
- name: Setup Java (temurin@8)
358358
id: setup-java-temurin-8
359359
if: matrix.java == 'temurin@8'

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
val sbtTypelevelVersion = "0.7.4"
1+
val sbtTypelevelVersion = "0.7.7"
22
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
33
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
44

0 commit comments

Comments
 (0)