Skip to content

Commit b80f675

Browse files
committed
Run Scala 3 / Native on macOS
1 parent 4a28420 commit b80f675

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/ci.yml

+7-10
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,16 @@ jobs:
3131
scala: [2.12.17, 2.13.10, 3.2.1]
3232
java: [temurin@11]
3333
project: [rootJS, rootJVM, rootNative]
34+
include:
35+
- scala: 3.2.1
36+
project: rootNative
37+
os: macos-latest
3438
exclude:
3539
- scala: 3.2.1
3640
project: rootJVM
41+
- scala: 3.2.1
42+
project: rootNative
43+
os: ubuntu-latest
3744
runs-on: ${{ matrix.os }}
3845
steps:
3946
- name: Checkout current branch (full)
@@ -224,16 +231,6 @@ jobs:
224231
tar xf targets.tar
225232
rm targets.tar
226233
227-
- name: Download target directories (3.2.1, rootNative)
228-
uses: actions/download-artifact@v2
229-
with:
230-
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootNative
231-
232-
- name: Inflate target directories (3.2.1, rootNative)
233-
run: |
234-
tar xf targets.tar
235-
rm targets.tar
236-
237234
- name: Import signing key
238235
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
239236
run: echo $PGP_SECRET | base64 -di | gpg --import

build.sbt

+8-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@ ThisBuild / tlBaseVersion := "2.5"
77

88
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))
99

10-
ThisBuild / githubWorkflowBuildMatrixExclusions += // TODO
11-
MatrixExclude(Map("scala" -> scala3, "project" -> "rootJVM"))
10+
ThisBuild / githubWorkflowBuildMatrixExclusions ++= Seq(
11+
MatrixExclude(Map("scala" -> scala3, "project" -> "rootJVM")), // TODO
12+
MatrixExclude(
13+
Map("scala" -> scala3, "project" -> "rootNative", "os" -> "ubuntu-latest")
14+
) // run on macOS instead
15+
)
1216

13-
Global / concurrentRestrictions += Tags.limit(NativeTags.Link, 1)
17+
ThisBuild / githubWorkflowBuildMatrixInclusions +=
18+
MatrixInclude(Map("scala" -> scala3, "project" -> "rootNative"), Map("os" -> "macos-latest"))
1419

1520
val tzdbVersion = "2019c"
1621
val scalajavaLocalesVersion = "1.5.1"

0 commit comments

Comments
 (0)