Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,14 @@ jobs:
shell: bash
run: sbt '++ ${{ matrix.scala }}' 'rootNative/scalafixAll --check'

- shell: bash
- if: matrix.ci == 'ciNative' && matrix.os == 'ubuntu-22.04-arm'
env:
LLVM_BIN: /usr/lib/llvm-15/bin
shell: bash
run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'

- if: matrix.ci != 'ciNative' || matrix.os != 'ubuntu-22.04-arm'
shell: bash
run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'

- if: (matrix.scala == '2.13.18' || matrix.scala == '3.3.7') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
Expand Down
15 changes: 14 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ val ArmOS = "ubuntu-22.04-arm"
val Windows = "windows-latest"
val MacOS = "macos-14"

val ScalaNativeLLVM = "/usr/lib/llvm-15/bin"
val ArmNativeCI = s"matrix.ci == '${CI.Native.command}' && matrix.os == '$ArmOS'"
val NonArmNativeCI = s"matrix.ci != '${CI.Native.command}' || matrix.os != '$ArmOS'"
val ArmNativeEnv = Map("LLVM_BIN" -> ScalaNativeLLVM)

val Scala212 = "2.12.21"
val Scala213 = "2.13.18"
val Scala3 = "3.3.7"
Expand Down Expand Up @@ -178,7 +183,15 @@ ThisBuild / githubWorkflowBuild := Seq("JVM", "JS", "Native").map { platform =>
) // windows has file lock issues due to shared sources
)
} ++ Seq(
WorkflowStep.Sbt(List("${{ matrix.ci }}")),
WorkflowStep.Sbt(
List("${{ matrix.ci }}"),
cond = Some(ArmNativeCI),
env = ArmNativeEnv
),
WorkflowStep.Sbt(
List("${{ matrix.ci }}"),
cond = Some(NonArmNativeCI)
),
WorkflowStep.Sbt(
List("docs/mdoc"),
cond = Some(
Expand Down
Loading