From 76d4a5a28d8f5b858e1562965b42f4928b015b9a Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Wed, 2 Feb 2022 18:05:10 +0100
Subject: [PATCH] Ensure the vc-redist job runs fine on GHA Windows 2022
 workers

---
 build.sc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.sc b/build.sc
index 8ba942078c..dcd6b20e13 100644
--- a/build.sc
+++ b/build.sc
@@ -989,15 +989,19 @@ object ci extends Module {
 
     commitChanges(s"Update CentOS packages for $version", branch, packagesDir)
   }
-  private def vsBasePath = os.Path("C:\\Program Files (x86)\\Microsoft Visual Studio")
+  private def vsBasePaths = Seq(
+    os.Path("C:\\Program Files\\Microsoft Visual Studio"),
+    os.Path("C:\\Program Files (x86)\\Microsoft Visual Studio")
+  )
   def copyVcRedist(directory: String = "artifacts", distName: String = "vc_redist.x64.exe") =
     T.command {
-      def vcVersions = Seq("2019", "2017")
+      def vcVersions = Seq("2022", "2019", "2017")
       def vcEditions = Seq("Enterprise", "Community", "BuildTools")
       def candidateBaseDirs =
         for {
-          year    <- vcVersions
-          edition <- vcEditions
+          vsBasePath <- vsBasePaths
+          year       <- vcVersions
+          edition    <- vcEditions
         } yield vsBasePath / year / edition / "VC" / "Redist" / "MSVC"
       val baseDirs = candidateBaseDirs.filter(os.isDir(_))
       if (baseDirs.isEmpty)