Skip to content

Commit

Permalink
Add macOS 14 to CI matrix to enable tests on Apple Silicon / arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunk committed Feb 7, 2024
1 parent 2dfa388 commit d1ea379
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ jobs:
name: Build and Test
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
os:
- macos-12
- macos-14
- ubuntu-latest
- windows-latest
scala: [3]
java: [temurin@11]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -62,7 +66,7 @@ jobs:
run: sbt githubWorkflowCheck

- name: Check headers and formatting
if: matrix.java == 'temurin@11' && matrix.os == 'macos-latest'
if: matrix.java == 'temurin@11' && matrix.os == 'macos-12'
shell: bash
run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck

Expand All @@ -71,12 +75,12 @@ jobs:
run: sbt '++ ${{ matrix.scala }}' test

- name: Check binary compatibility
if: matrix.java == 'temurin@11' && matrix.os == 'macos-latest'
if: matrix.java == 'temurin@11' && matrix.os == 'macos-12'
shell: bash
run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues

- name: Generate API documentation
if: matrix.java == 'temurin@11' && matrix.os == 'macos-latest'
if: matrix.java == 'temurin@11' && matrix.os == 'macos-12'
shell: bash
run: sbt '++ ${{ matrix.scala }}' doc

Expand All @@ -103,7 +107,7 @@ jobs:
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
strategy:
matrix:
os: [macos-latest]
os: [macos-12]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ ThisBuild / javaCppVersion := "1.5.10"
ThisBuild / resolvers ++= Resolver.sonatypeOssRepos("snapshots")

ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))
ThisBuild / githubWorkflowOSes := Seq("macos-latest", "ubuntu-latest", "windows-latest")
// macos 12/14 to test on x86_64/arm64 respectively
ThisBuild / githubWorkflowOSes := Seq("macos-12", "macos-14", "ubuntu-latest", "windows-latest")

val enableGPU = settingKey[Boolean]("enable or disable GPU support")

Expand Down

0 comments on commit d1ea379

Please sign in to comment.