Skip to content

Commit ac0033c

Browse files
authored
Merge pull request #587 from http4s/update/series/1.x/sbt-http4s-org-0.17.6
2 parents ead4559 + f3e33ee commit ac0033c

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

Diff for: .github/workflows/ci.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ concurrency:
2424

2525
jobs:
2626
build:
27-
name: Build and Test
27+
name: Test
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
os: [ubuntu-latest]
31+
os: [ubuntu-22.04]
3232
scala: [2.13, 3]
3333
java: [temurin@8, temurin@11, temurin@17]
3434
exclude:
@@ -39,14 +39,14 @@ jobs:
3939
runs-on: ${{ matrix.os }}
4040
timeout-minutes: 60
4141
steps:
42-
- name: Install sbt
43-
uses: sbt/setup-sbt@v1
44-
4542
- name: Checkout current branch (full)
4643
uses: actions/checkout@v4
4744
with:
4845
fetch-depth: 0
4946

47+
- name: Setup sbt
48+
uses: sbt/setup-sbt@v1
49+
5050
- name: Setup Java (temurin@8)
5151
id: setup-java-temurin-8
5252
if: matrix.java == 'temurin@8'
@@ -90,18 +90,18 @@ jobs:
9090
run: sbt githubWorkflowCheck
9191

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

9696
- name: Test
9797
run: sbt '++ ${{ matrix.scala }}' test
9898

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

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

107107
- name: Check scalafix lints
@@ -133,18 +133,18 @@ jobs:
133133
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/1.x')
134134
strategy:
135135
matrix:
136-
os: [ubuntu-latest]
136+
os: [ubuntu-22.04]
137137
java: [temurin@8]
138138
runs-on: ${{ matrix.os }}
139139
steps:
140-
- name: Install sbt
141-
uses: sbt/setup-sbt@v1
142-
143140
- name: Checkout current branch (full)
144141
uses: actions/checkout@v4
145142
with:
146143
fetch-depth: 0
147144

145+
- name: Setup sbt
146+
uses: sbt/setup-sbt@v1
147+
148148
- name: Setup Java (temurin@8)
149149
id: setup-java-temurin-8
150150
if: matrix.java == 'temurin@8'
@@ -233,18 +233,18 @@ jobs:
233233
if: github.event.repository.fork == false && github.event_name != 'pull_request'
234234
strategy:
235235
matrix:
236-
os: [ubuntu-latest]
236+
os: [ubuntu-22.04]
237237
java: [temurin@8]
238238
runs-on: ${{ matrix.os }}
239239
steps:
240-
- name: Install sbt
241-
uses: sbt/setup-sbt@v1
242-
243240
- name: Checkout current branch (full)
244241
uses: actions/checkout@v4
245242
with:
246243
fetch-depth: 0
247244

245+
- name: Setup sbt
246+
uses: sbt/setup-sbt@v1
247+
248248
- name: Setup Java (temurin@8)
249249
id: setup-java-temurin-8
250250
if: matrix.java == 'temurin@8'
@@ -294,7 +294,7 @@ jobs:
294294
name: Validate Steward Config
295295
strategy:
296296
matrix:
297-
os: [ubuntu-latest]
297+
os: [ubuntu-22.04]
298298
java: [temurin@11]
299299
runs-on: ${{ matrix.os }}
300300
steps:

Diff for: project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// http4s organization
2-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.17.5")
2+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.17.6")
33

44
// ScalaDoc API mapping
55
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")

0 commit comments

Comments
 (0)