Merge pull request VirtusLab#585 from alexarchambault/windows-2022

Prepare build to windows-2022 GitHub action image

.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
 

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

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