From 530967437b8dce8a851f63c10fdbac143fa5a9ae Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 27 Jan 2022 19:19:07 +0100 Subject: [PATCH 1/2] Clean-up (trailing space) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b7132f8ef..6d80a0e8e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -203,7 +203,7 @@ jobs: - name: Test gifs run: gifs/generate_gifs.sh $(ls gifs/scenarios/) - name: Build binary - run: ./mill copyTo cli.launcher ./scala-cli + run: ./mill copyTo cli.launcher ./scala-cli - name: Check examples run: bash ./scala-cli --jvm temurin:17 .github/scripts/check_examples.sc From ca1f78666a1c3801d6a58c9b73dd094acb9222e5 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 27 Jan 2022 20:09:13 +0100 Subject: [PATCH 2/2] Add support for Visual Studio 2022 installations --- build.sc | 12 ++++++++---- project/settings.sc | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.sc b/build.sc index 9ba2866cc6..8ba942078c 100644 --- a/build.sc +++ b/build.sc @@ -1,6 +1,6 @@ import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION` import $ivy.`io.get-coursier::coursier-launcher:2.1.0-M2` -import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.15` +import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.16` import $file.project.deps, deps.{Deps, Docker, InternalDeps, Scala, TestDeps} import $file.project.publish, publish.{ghOrg, ghName, ScalaCliPublishModule} import $file.project.settings, settings.{ @@ -1030,13 +1030,17 @@ object ci extends Module { def writeWixConfigExtra(dest: String = "wix-visual-cpp-redist.xml") = T.command { val msmPath = { - val vcVersions = Seq("2019", "2017") - val vcEditions = Seq("Enterprise", "Community", "BuildTools") - val vsDir = os.Path("""C:\Program Files (x86)\Microsoft Visual Studio""") + val vcVersions = Seq("2022", "2019", "2017") + val vcEditions = Seq("Enterprise", "Community", "BuildTools") + val vsDirs = Seq( + os.Path("""C:\Program Files\Microsoft Visual Studio"""), + os.Path("""C:\Program Files (x86)\Microsoft Visual Studio""") + ) val fileNamePrefix = "Microsoft_VC".toLowerCase(Locale.ROOT) val fileNameSuffix = "_CRT_x64.msm".toLowerCase(Locale.ROOT) def candidatesIt = for { + vsDir <- vsDirs.iterator version <- vcVersions.iterator edition <- vcEditions.iterator dir = vsDir / version / edition diff --git a/project/settings.sc b/project/settings.sc index e6a73f8945..82d02b27ce 100644 --- a/project/settings.sc +++ b/project/settings.sc @@ -1,5 +1,5 @@ import $ivy.`com.goyeau::mill-scalafix::0.2.8` -import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.15` +import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.16` import $file.deps, deps.{Deps, Docker, buildCsVersion} import com.goyeau.mill.scalafix.ScalafixModule