Skip to content

Commit 7aa9a4e

Browse files
committed
remove macos
1 parent 3cbbcc9 commit 7aa9a4e

File tree

2 files changed

+19
-25
lines changed

2 files changed

+19
-25
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,9 @@ jobs:
3131
scala: [2.12, 2.13, 3]
3232
java: [corretto@11]
3333
project: [rootJS, rootJVM, rootNative]
34-
include:
35-
- scala: 3
36-
java: corretto@11
37-
project: rootNative
38-
os: macos-latest
3934
exclude:
4035
- scala: 3
4136
project: rootJVM
42-
- scala: 3
43-
project: rootNative
44-
os: ubuntu-latest
4537
runs-on: ${{ matrix.os }}
4638
timeout-minutes: 60
4739
steps:
@@ -198,6 +190,16 @@ jobs:
198190
tar xf targets.tar
199191
rm targets.tar
200192
193+
- name: Download target directories (3, rootNative)
194+
uses: actions/download-artifact@v4
195+
with:
196+
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative
197+
198+
- name: Inflate target directories (3, rootNative)
199+
run: |
200+
tar xf targets.tar
201+
rm targets.tar
202+
201203
- name: Import signing key
202204
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
203205
env:

build.sbt

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,9 @@ ThisBuild / githubWorkflowJavaVersions := Seq(javaDistro)
1111
ThisBuild / githubWorkflowSbtCommand := "./sbt"
1212

1313
ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq(
14-
MatrixExclude(Map("scala" -> "3", "project" -> "rootJVM")), // TODO
15-
MatrixExclude(
16-
Map("scala" -> "3", "project" -> "rootNative", "os" -> "ubuntu-latest")
17-
) // run on macOS instead
14+
MatrixExclude(Map("scala" -> "3", "project" -> "rootJVM")) // TODO
1815
)
1916

20-
ThisBuild / githubWorkflowBuildMatrixInclusions +=
21-
MatrixInclude(Map("scala" -> "3", "java" -> javaDistro.render, "project" -> "rootNative"),
22-
Map("os" -> "macos-latest")
23-
)
24-
2517
val tzdbVersion = "2019c"
2618
val scalajavaLocalesVersion = "1.5.4"
2719
Global / onChangedBuildSource := ReloadOnSourceChanges
@@ -177,9 +169,9 @@ lazy val tzdb = crossProject(JVMPlatform, JSPlatform, NativePlatform)
177169
.in(file("tzdb"))
178170
.settings(commonSettings)
179171
.settings(
180-
name := "scala-java-time-tzdb",
181-
includeTTBP := true,
182-
dbVersion := TzdbPlugin.Version(tzdbVersion),
172+
name := "scala-java-time-tzdb",
173+
includeTTBP := true,
174+
dbVersion := TzdbPlugin.Version(tzdbVersion)
183175
)
184176
.jsSettings(
185177
Compile / sourceGenerators += Def.task {
@@ -248,12 +240,12 @@ lazy val demo = crossProject(JSPlatform, JVMPlatform, NativePlatform)
248240
.dependsOn(core)
249241
.enablePlugins(TzdbPlugin, NoPublishPlugin)
250242
.settings(
251-
name := "demo",
252-
Keys.`package` := file(""),
253-
zonesFilter := zonesFilterFn,
254-
dbVersion := TzdbPlugin.Version(tzdbVersion),
243+
name := "demo",
244+
Keys.`package` := file(""),
245+
zonesFilter := zonesFilterFn,
246+
dbVersion := TzdbPlugin.Version(tzdbVersion),
255247
// delegate test to run, so that it is invoked during test step in ci
256-
Test / test := (Compile / run).toTask("").value
248+
Test / test := (Compile / run).toTask("").value
257249
)
258250
.jsSettings(
259251
scalaJSUseMainModuleInitializer := true

0 commit comments

Comments
 (0)