From 033b23a5f3f4bd76d30ad95fac18dcb167fc805b Mon Sep 17 00:00:00 2001 From: ngc7331 Date: Fri, 4 Sep 2026 16:25:53 +0800 Subject: [PATCH] chore: bump mill to 0.12.17 to sync with OpenXiangShan/XiangShan, and let OpenXiangShan/xs-env env-test.sh script check for newer toolchain Signed-off-by: ngc7331 --- .mill-version | 2 +- build.sc => build.mill | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) rename build.sc => build.mill (60%) diff --git a/.mill-version b/.mill-version index b80f98e6..e392c3dc 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.11.7 +0.12.17 diff --git a/build.sc b/build.mill similarity index 60% rename from build.sc rename to build.mill index f454f795..bf472f18 100644 --- a/build.sc +++ b/build.mill @@ -1,10 +1,14 @@ -import mill._, scalalib._ -import coursier.maven.MavenRepository +package build + +import mill._ +import mill.scalalib._ + +val pwd = os.Path(sys.env("MILL_WORKSPACE_ROOT")) object ivys { val scala = "2.13.14" - val chisel = ivy"org.chipsalliance::chisel:7.11.0" - val chiselPlugin = ivy"org.chipsalliance:::chisel-plugin:7.11.0" + val chisel = mvn"org.chipsalliance::chisel:7.11.0" + val chiselPlugin = mvn"org.chipsalliance:::chisel-plugin:7.11.0" } trait CommonModule extends ScalaModule { @@ -21,17 +25,15 @@ trait HasChisel extends ScalaModule { trait CommonNS extends SbtModule with CommonModule with HasChisel object difftest extends CommonNS { - override def millSourcePath = os.pwd / "difftest" + override def millSourcePath = pwd / "difftest" } object generator extends CommonNS { - - override def millSourcePath = os.pwd + override def millSourcePath = pwd override def moduleDeps = super.moduleDeps ++ Seq( difftest ) - object test extends SbtModuleTests with TestModule.ScalaTest - + object test extends SbtTests with TestModule.ScalaTest }