Skip to content

Commit b0e233d

Browse files
committed
CI and build.sc updates
1 parent 725a184 commit b0e233d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
$CHISEL_FIRTOOL_PATH/firtool -version >> $GITHUB_STEP_SUMMARY
133133
echo \`\`\` >> $GITHUB_STEP_SUMMARY
134134
- name: Compile with Mill
135-
run: ./mill chisel[2.13.15].compile
135+
run: ./mill chisel[].compile
136136

137137
mill3:
138138
name: compile scala-3 project with mill
@@ -188,7 +188,7 @@ jobs:
188188
- name: Check Build Script Formatting
189189
run: ./mill --meta-level 1 mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll sources
190190
- name: Check Source File Format
191-
run: ./mill chisel[2.13.15].checkFormat
191+
run: ./mill chisel[].checkFormat
192192

193193
integration:
194194
name: Integration Tests
@@ -221,7 +221,7 @@ jobs:
221221
dir=$(dirname $(which firtool))
222222
echo "CHISEL_FIRTOOL_PATH=$dir" >> "$GITHUB_ENV"
223223
- name: Integration Tests
224-
run: ./mill -j0 integrationTests[2.13.15].test
224+
run: ./mill -j0 integrationTests[].test
225225

226226
# Currently just a sanity check that the benchmarking flow works
227227
benchmark:

build.sc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ object v extends Module {
3838
}
3939

4040
val scalaCrossVersions = Seq(
41-
"3.3.3",
42-
"2.13.15"
41+
"2.13.15",
42+
"3.3.3"
4343
)
4444

4545
def isScala3(ver: String): Boolean = ver.startsWith("3.")
@@ -314,7 +314,7 @@ trait Plugin extends CrossSbtModule with ScalafmtModule with ChiselPublishModule
314314
}
315315

316316
object chisel extends Cross[Chisel](v.scalaCrossVersions)
317-
trait Chisel extends CrossSbtModule with HasScala2MacroAnno with ScalafmtModule {
317+
trait Chisel extends CrossSbtModule with HasScala2MacroAnno with HasScala2Plugin with ScalafmtModule {
318318
override def millSourcePath = super.millSourcePath / os.up
319319
def svsimModule = svsim(crossScalaVersion)
320320
def coreModule = core(crossScalaVersion)

0 commit comments

Comments
 (0)