Skip to content

Commit e68d6b4

Browse files
authored
Merge pull request #173 from typelevel/build-updates
Build updates
2 parents 8bc7732 + 7b2d2b2 commit e68d6b4

File tree

4 files changed

+27
-30
lines changed

4 files changed

+27
-30
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +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.13, 3]
3232
java: [temurin@8]
3333
project: [rootJVM]
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
3636
steps:
37-
- name: Install sbt
38-
if: contains(runner.os, 'macos')
39-
run: brew install sbt
40-
4137
- name: Checkout current branch (full)
4238
uses: actions/checkout@v4
4339
with:
4440
fetch-depth: 0
4541

42+
- name: Setup sbt
43+
uses: sbt/setup-sbt@v1
44+
4645
- name: Setup Java (temurin@8)
4746
id: setup-java-temurin-8
4847
if: matrix.java == 'temurin@8'
@@ -60,18 +59,18 @@ jobs:
6059
run: sbt githubWorkflowCheck
6160

6261
- name: Check headers and formatting
63-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
62+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
6463
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
6564

6665
- name: Test
6766
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
6867

6968
- name: Check binary compatibility
70-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
69+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
7170
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
7271

7372
- name: Generate API documentation
74-
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
73+
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
7574
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
7675

7776
- name: Make target directories
@@ -95,19 +94,18 @@ jobs:
9594
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
9695
strategy:
9796
matrix:
98-
os: [ubuntu-latest]
97+
os: [ubuntu-22.04]
9998
java: [temurin@8]
10099
runs-on: ${{ matrix.os }}
101100
steps:
102-
- name: Install sbt
103-
if: contains(runner.os, 'macos')
104-
run: brew install sbt
105-
106101
- name: Checkout current branch (full)
107102
uses: actions/checkout@v4
108103
with:
109104
fetch-depth: 0
110105

106+
- name: Setup sbt
107+
uses: sbt/setup-sbt@v1
108+
111109
- name: Setup Java (temurin@8)
112110
id: setup-java-temurin-8
113111
if: matrix.java == 'temurin@8'
@@ -167,22 +165,21 @@ jobs:
167165

168166
dependency-submission:
169167
name: Submit Dependencies
170-
if: github.event_name != 'pull_request'
168+
if: github.event.repository.fork == false && github.event_name != 'pull_request'
171169
strategy:
172170
matrix:
173-
os: [ubuntu-latest]
171+
os: [ubuntu-22.04]
174172
java: [temurin@8]
175173
runs-on: ${{ matrix.os }}
176174
steps:
177-
- name: Install sbt
178-
if: contains(runner.os, 'macos')
179-
run: brew install sbt
180-
181175
- name: Checkout current branch (full)
182176
uses: actions/checkout@v4
183177
with:
184178
fetch-depth: 0
185179

180+
- name: Setup sbt
181+
uses: sbt/setup-sbt@v1
182+
186183
- name: Setup Java (temurin@8)
187184
id: setup-java-temurin-8
188185
if: matrix.java == 'temurin@8'
@@ -206,19 +203,18 @@ jobs:
206203
name: Generate Site
207204
strategy:
208205
matrix:
209-
os: [ubuntu-latest]
206+
os: [ubuntu-22.04]
210207
java: [temurin@11]
211208
runs-on: ${{ matrix.os }}
212209
steps:
213-
- name: Install sbt
214-
if: contains(runner.os, 'macos')
215-
run: brew install sbt
216-
217210
- name: Checkout current branch (full)
218211
uses: actions/checkout@v4
219212
with:
220213
fetch-depth: 0
221214

215+
- name: Setup sbt
216+
uses: sbt/setup-sbt@v1
217+
222218
- name: Setup Java (temurin@8)
223219
id: setup-java-temurin-8
224220
if: matrix.java == 'temurin@8'

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ThisBuild / tlSonatypeUseLegacyHost := false
1717
// publish website from this branch
1818
ThisBuild / tlSitePublishBranch := Some("main")
1919

20-
val Scala213 = "2.13.14"
20+
val Scala213 = "2.13.16"
2121
ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.3")
2222
ThisBuild / scalaVersion := Scala213 // the default Scala
2323

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.1
1+
sbt.version=1.10.7

project/plugins.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.2")
2-
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.2")
3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
1+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7")
2+
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.7")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2")
4+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7")

0 commit comments

Comments
 (0)