From 516de30fc22cdac08c03a11b7560f85a6a025c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BE=AA?= Date: Fri, 25 Oct 2024 14:38:50 +1300 Subject: [PATCH] Will it compile? --- .github/workflows/build.yml | 2 +- build.sbt | 10 +++++----- .../main/scala/chester/cli/platform/platforms.scala | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc504872..5992bc07 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -345,4 +345,4 @@ jobs: with: timeout_minutes: 25 max_attempts: 3 - command: sbt test + command: sbt testAll diff --git a/build.sbt b/build.sbt index 24b4cb69..2f397ed3 100644 --- a/build.sbt +++ b/build.sbt @@ -10,6 +10,8 @@ import scala.sys.process._ ThisBuild / version := sys.env.getOrElse("VERSION", "0.0.24") ThisBuild / organization := "com.github.chester-lang" +addCommandAlias("testAll", "rootJVM/test ; rootJS/test ; platform0Native/test") + addCommandAlias("format", "scalafmtAll ; scalafmtSbt ; scalafixAll") addCommandAlias("fmt", "scalafmtAll ; scalafmtSbt") inThisBuild( @@ -517,8 +519,8 @@ lazy val tyck = crossProject(JSPlatform, JVMPlatform, NativePlatform) ) .jvmSettings(commonJvmLibSettings) -// too hard to compile this for scala nativa, linking problem with scala stdlib -lazy val compiler213 = crossProject(JSPlatform, JVMPlatform) +// compiles with scala native but test / nativeLink for this subproject is broken. +lazy val compiler213 = crossProject(JSPlatform, JVMPlatform, NativePlatform) .withoutSuffixFor(JVMPlatform) .crossType(CrossType.Full) .in(file("compiler213")) @@ -537,9 +539,7 @@ lazy val compiler = crossProject(JSPlatform, JVMPlatform, NativePlatform) .withoutSuffixFor(JVMPlatform) .crossType(CrossType.Full) .in(file("compiler")) - .dependsOn(utils, syntax, err) - .jvmConfigure(_.dependsOn(compiler213.jvm)) - .jsConfigure(_.dependsOn(compiler213.js)) + .dependsOn(utils, syntax, err, compiler213) .settings( name := "compiler", commonSettings diff --git a/cli/native/src/main/scala/chester/cli/platform/platforms.scala b/cli/native/src/main/scala/chester/cli/platform/platforms.scala index 7ffcc1c9..a22ecaf5 100644 --- a/cli/native/src/main/scala/chester/cli/platform/platforms.scala +++ b/cli/native/src/main/scala/chester/cli/platform/platforms.scala @@ -1,5 +1,7 @@ package chester.cli.platform def testFunctionalities(): Unit = { - () + println("functionalities test start") + chester.scala.Test.callit() + println("functionalities test end") }