diff --git a/make-msys2-installer b/make-msys2-installer index 005a1bb..38ebcf9 100644 --- a/make-msys2-installer +++ b/make-msys2-installer @@ -106,6 +106,7 @@ install_coursier(){ export COURSIER_CACHE=${_newmsys}/cache/.coursier echo "export COURSIER_CACHE=/cache/.coursier" >> ${_newmsys}/etc/skel/.bashrc export COURSIER_HOME=${_newmsys}/coursier + export COURSIER_BIN_DIR=${_newmsys}/coursier echo "export PATH=\"\$PATH:/coursier\"" >> ${_newmsys}/etc/skel/.bashrc echo "alias coursier=cs.bat" >> ${_newmsys}/etc/skel/.bashrc @@ -124,6 +125,9 @@ setup_sbt(){ ${COURSIER} fetch jline:jline:2.14.3 ${COURSIER} fetch org.fusesource.jansi:jansi:1.12 ${COURSIER} fetch --sbt-plugin org.scalameta:sbt-scalafmt:2.4.6 + + echo "alias mill=mill.bat" >> ${_newmsys}/etc/skel/.bashrc + ${COURSIER} install mill } _spinal_with_tester="1.8.0" diff --git a/test_template.sh b/test_template.sh index caad3cd..03a155a 100644 --- a/test_template.sh +++ b/test_template.sh @@ -17,6 +17,7 @@ do_test(){ export COURSIER_CACHE=${_newmsys}/cache/.coursier export SBT_OPTS="-Dsbt.version=${_sbt_version} -Dsbt.boot.directory=${_newmsys}/cache/.sbt/boot -Dsbt.global.base=${_newmsys}/cache/.sbt/1.0 -Dsbt.ivy.home=${_newmsys}/cache/.ivy2" export SBT_CMD="${SDKMAN_DIR}/candidates/sbt/current/bin/sbt ${SBT_OPTS}" + export MILL_CMD="${_newmsys}/coursier/mill.bat" git clone https://github.com/SpinalHDL/SpinalTemplateSbt.git cd SpinalTemplateSbt || exit @@ -42,6 +43,7 @@ val scalaTest = "org.scalatest" %% "scalatest" % "3.2.14"' build.sbt fi ${SBT_CMD} -Dsbt.offline=true "test" || exit + ${MILL_CMD} _.compile || exit cd .. }