Skip to content

Commit a15a7a3

Browse files
committed
Use GHA instead of Cirrus for macOS I/O tests
1 parent 03d071f commit a15a7a3

File tree

2 files changed

+45
-8
lines changed

2 files changed

+45
-8
lines changed

.github/workflows/ci.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105

106106
publish:
107107
name: Publish Artifacts
108-
needs: [build]
108+
needs: [build, macos]
109109
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
110110
strategy:
111111
matrix:
@@ -238,9 +238,6 @@ jobs:
238238
echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
239239
(echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
240240
241-
- name: Wait for Cirrus CI
242-
uses: typelevel/await-cirrus@main
243-
244241
- name: Publish
245242
env:
246243
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
@@ -281,6 +278,36 @@ jobs:
281278
modules-ignore: integration_2.12 integration_2.13 integration_3 rootjs_2.12 rootjs_2.13 rootjs_3 microsite_2.12 microsite_2.13 microsite_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 fs2-benchmark_2.12 fs2-benchmark_2.13 fs2-benchmark_3
282279
configs-ignore: test scala-tool scala-doc-tool test-internal
283280

281+
macos:
282+
name: Test I/O on macOS
283+
strategy:
284+
matrix:
285+
os: [macos-latest]
286+
java: [temurin@17]
287+
runs-on: ${{ matrix.os }}
288+
steps:
289+
- name: Checkout current branch (full)
290+
uses: actions/checkout@v4
291+
with:
292+
fetch-depth: 0
293+
294+
- name: Setup Java (temurin@17)
295+
id: setup-java-temurin-17
296+
if: matrix.java == 'temurin@17'
297+
uses: actions/setup-java@v3
298+
with:
299+
distribution: temurin
300+
java-version: 17
301+
cache: sbt
302+
303+
- name: sbt update
304+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
305+
run: sbt +update
306+
307+
- run: brew install s2n
308+
309+
- run: sbt ioJVM/test ioJS/test ioNative/test
310+
284311
site:
285312
name: Generate Site
286313
strategy:

build.sbt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,22 @@ ThisBuild / githubWorkflowBuild ++= Seq(
2727
)
2828
)
2929

30-
ThisBuild / githubWorkflowPublishPreamble +=
31-
WorkflowStep.Use(
32-
UseRef.Public("typelevel", "await-cirrus", "main"),
33-
name = Some("Wait for Cirrus CI")
30+
ThisBuild / githubWorkflowAddedJobs +=
31+
WorkflowJob(
32+
"macos",
33+
"Test I/O on macOS",
34+
scalas = Nil,
35+
sbtStepPreamble = Nil,
36+
javas = List(githubWorkflowJavaVersions.value.head),
37+
oses = List("macos-latest"),
38+
steps = githubWorkflowJobSetup.value.toList ++ List(
39+
WorkflowStep.Run(List("brew install s2n")),
40+
WorkflowStep.Sbt(List("ioJVM/test", "ioJS/test", "ioNative/test"))
41+
)
3442
)
3543

44+
ThisBuild / githubWorkflowPublishNeeds += "macos"
45+
3646
ThisBuild / licenses := List(("MIT", url("http://opensource.org/licenses/MIT")))
3747

3848
ThisBuild / doctestTestFramework := DoctestTestFramework.ScalaCheck

0 commit comments

Comments
 (0)