Skip to content

Commit

Permalink
Merge pull request #3431 from typelevel/topic/fix-macos-runners
Browse files Browse the repository at this point in the history
Fix macos gha runners
  • Loading branch information
mpilquist committed May 12, 2024
2 parents 9213dce + 0f58630 commit 112275e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@ jobs:
project: [ioJS, ioJVM, ioNative]
runs-on: ${{ matrix.os }}
steps:
- run: brew install sbt

- name: Checkout current branch (full)
uses: actions/checkout@v4
with:
Expand Down
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ ThisBuild / githubWorkflowAddedJobs +=
javas = List(githubWorkflowJavaVersions.value.head),
oses = List("macos-latest"),
matrixAdds = Map("project" -> List("ioJS", "ioJVM", "ioNative")),
steps = githubWorkflowJobSetup.value.toList ++ List(
steps = List(
WorkflowStep.Run(List("brew install sbt"))
) ++ githubWorkflowJobSetup.value.toList ++ List(
WorkflowStep.Run(List("brew install s2n"), cond = Some("matrix.project == 'ioNative'")),
WorkflowStep.Sbt(List("${{ matrix.project }}/test"))
)
Expand Down

0 comments on commit 112275e

Please sign in to comment.