Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare build to windows-2022 GitHub action image #585

Merged
merged 2 commits into from
Jan 28, 2022
Merged

Prepare build to windows-2022 GitHub action image #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5309674
Clean-up (trailing space)
alexarchambault Jan 27, 2022
ca1f786
Add support for Visual Studio 2022 installations
alexarchambault Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 8 additions & 4 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.{
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion project/settings.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down