Skip to content

Commit 90eae2e

Browse files
committed
wip
1 parent d64abd7 commit 90eae2e

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,42 @@ jobs:
1212
matrix:
1313
java: [8, 11, 17]
1414
scala: [2.11.x, 2.12.x, 2.13.x, 3.x]
15-
platform: [jvm, js, native]
15+
platform: [JVM, JS, Native]
1616
mode: [normal]
1717
exclude:
1818
- java: 11
19-
platform: js
19+
platform: JS
2020
- java: 11
21-
platform: native
21+
platform: Native
2222
- java: 17
23-
platform: js
23+
platform: JS
2424
- java: 17
25-
platform: native
25+
platform: Native
2626
include:
2727
- java: 8
2828
scala: 2.12.x
2929
mode: testScalafix
30-
platform: jvm
30+
platform: JVM
3131
- java: 8
3232
scala: 2.12.x
3333
mode: testBinaryCompat
34-
platform: jvm
34+
platform: JVM
3535
- java: 8
3636
scala: 2.12.x
3737
mode: testScalafmt
38-
platform: jvm
38+
platform: JVM
3939
- java: 8
4040
scala: 2.12.x
4141
mode: headerCheck
42-
platform: jvm
42+
platform: JVM
4343
- java: 11
4444
scala: 2.12.x
4545
mode: normal
46-
platform: jvm
46+
platform: JVM
4747
- java: 17
4848
scala: 2.12.x
4949
mode: normal
50-
platform: jvm
50+
platform: JVM
5151
runs-on: ubuntu-latest
5252
env:
5353
CI_JDK: ${{matrix.java}}

build.sbt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,7 @@ lazy val scalafixTests = project
333333
.enablePlugins(BuildInfoPlugin, ScalafixTestkitPlugin)
334334

335335
val ciScalaVersion = sys.env.get("CI_SCALA_VERSION").flatMap(Version.parse)
336-
val isScalaJs = sys.env.get("CI_PLATFORM") == Some("js")
337-
val isScalaNative = sys.env.get("CI_PLATFORM") == Some("native")
336+
val ciPlatform = sys.env.get("CI_PLATFORM")
338337
val isScalafix = sys.env.get("CI_MODE") == Some("testScalafix")
339338
val isScalafmt = sys.env.get("CI_MODE") == Some("testScalafmt")
340339
val isBinaryCompat = sys.env.get("CI_MODE") == Some("testBinaryCompat")
@@ -368,9 +367,7 @@ inThisBuild {
368367
).foreach(k =>
369368
println(k.padTo(20, " ").mkString("") + " -> " + sys.env.getOrElse(k, "None")))
370369

371-
val platformSuffix = if (isScalaJs) "JS" else if (isScalaNative) "Native" else ""
372-
373-
val compatProject = s"compat${ciScalaVersion.get}$platformSuffix"
370+
val compatProject = s"compat${ciScalaVersion.get}${ciPlatform.get}"
374371
val binaryCompatProject = "binaryCompat"
375372

376373
val testProjectPrefix =

0 commit comments

Comments
 (0)