Skip to content

Commit 26bc1a9

Browse files
committed
wip
1 parent e6991de commit 26bc1a9

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ jobs:
4848
platform: jvm
4949
runs-on: ubuntu-latest
5050
env:
51-
TRAVIS_SCALA_VERSION: ${{matrix.scala}}
51+
CI_JDK: ${{matrix.java}}
52+
CI_SCALA_VERSION: ${{matrix.scala}}
5253
CI_MODE: ${{matrix.mode}}
5354
CI_PLATFORM: ${{matrix.platform}}
5455
steps:

build.sbt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,14 @@ lazy val scalafixTests = project
291291
.dependsOn(scalafixInput, scalafixRules)
292292
.enablePlugins(BuildInfoPlugin, ScalafixTestkitPlugin)
293293

294-
val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse)
295-
val isTravisTag = sys.env.get("TRAVIS_TAG").exists(_.nonEmpty)
296-
val isScalaJs = sys.env.get("SCALAJS_VERSION").exists(_.nonEmpty)
297-
val isScalaNative = sys.env.get("SCALANATIVE_VERSION").exists(_.nonEmpty)
298-
val isScalafix = sys.env.get("TEST_SCALAFIX").nonEmpty
299-
val isScalafmt = sys.env.get("TEST_SCALAFMT").nonEmpty
300-
val isBinaryCompat = sys.env.get("TEST_BINARY_COMPAT").nonEmpty
301-
val jdkVersion = sys.env.get("ADOPTOPENJDK").map(_.toInt)
294+
val ciScalaVersion = sys.env.get("CI_SCALA_VERSION").flatMap(Version.parse)
295+
val isTravisTag = sys.env.get("CI_TAG").exists(_.nonEmpty)
296+
val isScalaJs = sys.env.get("CI_PLATFORM") == Some("js")
297+
val isScalaNative = sys.env.get("CI_PLATFORM") == Some("native")
298+
val isScalafix = sys.env.get("CI_MODE") == Some("testScalafix")
299+
val isScalafmt = sys.env.get("CI_MODE") == Some("testScalafmt")
300+
val isBinaryCompat = sys.env.get("CI_MODE") == Some("testBinaryCompat")
301+
val jdkVersion = sys.env.get("CI_JDK").map(_.toInt)
302302

303303
// required by sbt-scala-module
304304
inThisBuild {
@@ -318,8 +318,8 @@ inThisBuild {
318318
Seq("scalafmtTest")
319319
} else {
320320
List(
321-
"TRAVIS_SCALA_VERSION",
322-
"TRAVIS_TAG",
321+
"CI_SCALA_VERSION",
322+
"CI_TAG",
323323
"SCALAJS_VERSION",
324324
"SCALANATIVE_VERSION",
325325
"TEST_SCALAFIX",
@@ -330,7 +330,7 @@ inThisBuild {
330330

331331
val platformSuffix = if (isScalaJs) "JS" else if (isScalaNative) "Native" else ""
332332

333-
val compatProject = "compat" + travisScalaVersion.get.binary + platformSuffix
333+
val compatProject = "compat" + ciScalaVersion.get.binary + platformSuffix
334334
val binaryCompatProject = "binaryCompat"
335335

336336
val testProjectPrefix =
@@ -371,7 +371,7 @@ inThisBuild {
371371
}
372372

373373
Seq(
374-
List(s"""++${sys.env.get("TRAVIS_SCALA_VERSION").get}!"""),
374+
List(s"""++${sys.env.get("CI_SCALA_VERSION").get}!"""),
375375
List(s"$projectPrefix/clean"),
376376
List(s"$testProjectPrefix/test"),
377377
List(s"$projectPrefix/publishLocal"),

0 commit comments

Comments
 (0)