CI and build.sc updates

chipsalliance · Dec 4, 2024 · b0e233d · b0e233d
1 parent 725a184
commit b0e233d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -132,7 +132,7 @@ jobs:
           $CHISEL_FIRTOOL_PATH/firtool -version >> $GITHUB_STEP_SUMMARY
           echo \`\`\` >> $GITHUB_STEP_SUMMARY
       - name: Compile with Mill
-        run: ./mill chisel[2.13.15].compile
+        run: ./mill chisel[].compile
 
   mill3:
     name: compile scala-3 project with mill
@@ -188,7 +188,7 @@ jobs:
       - name: Check Build Script Formatting
         run: ./mill --meta-level 1 mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll sources
       - name: Check Source File Format
-        run: ./mill chisel[2.13.15].checkFormat
+        run: ./mill chisel[].checkFormat
 
   integration:
     name: Integration Tests
@@ -221,7 +221,7 @@ jobs:
           dir=$(dirname $(which firtool))
           echo "CHISEL_FIRTOOL_PATH=$dir" >> "$GITHUB_ENV"
       - name: Integration Tests
-        run: ./mill -j0 integrationTests[2.13.15].test
+        run: ./mill -j0 integrationTests[].test
 
   # Currently just a sanity check that the benchmarking flow works
   benchmark:

diff --git a/build.sc b/build.sc
@@ -38,8 +38,8 @@ object v extends Module {
   }
 
   val scalaCrossVersions = Seq(
-    "3.3.3",
-    "2.13.15"
+    "2.13.15",
+    "3.3.3"
   )
 
   def isScala3(ver: String): Boolean = ver.startsWith("3.")
@@ -314,7 +314,7 @@ trait Plugin extends CrossSbtModule with ScalafmtModule with ChiselPublishModule
 }
 
 object chisel extends Cross[Chisel](v.scalaCrossVersions)
-trait Chisel extends CrossSbtModule with HasScala2MacroAnno with ScalafmtModule {
+trait Chisel extends CrossSbtModule with HasScala2MacroAnno with HasScala2Plugin with ScalafmtModule {
   override def millSourcePath = super.millSourcePath / os.up
   def svsimModule = svsim(crossScalaVersion)
   def coreModule = core(crossScalaVersion)