Skip to content

Commit eeb1349

Browse files
committed
wip
1 parent 90eae2e commit eeb1349

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +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 ciPlatform = sys.env.get("CI_PLATFORM")
336+
val ciPlatform = sys.env.get("CI_PLATFORM").map(p => if (p == "JVM") "" else p)
337337
val isScalafix = sys.env.get("CI_MODE") == Some("testScalafix")
338338
val isScalafmt = sys.env.get("CI_MODE") == Some("testScalafmt")
339339
val isBinaryCompat = sys.env.get("CI_MODE") == Some("testBinaryCompat")

project/MultiScalaProject.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ import java.io.File
3030
trait MultiScala {
3131
def majorMinor(in: String): String = {
3232
val Array(major, minor, _) = in.split("\\.")
33-
major + minor
33+
if (major == "2")
34+
s"$major$minor"
35+
else
36+
major
3437
}
3538

3639
def projectIdPerScala(name: String, scalaV: String): String = s"$name${majorMinor(scalaV)}"

0 commit comments

Comments
 (0)