getdeps: update github windows runner and internal CI to VS 2022

Summary:
X-link: facebookincubator/fizz#163

The github [windows-2019 actions image was retired by github](actions/runner-images#12045),  so all jobs on it fail

Update to windows-2022 to get them running again

windows-2022 has [different tools and versions than windows-2019](actions/runner-images#3949).  Notably it moves from Visual Studio 2019 (aka msvc 16.x) to Visual Studio 2022 (aka msvc 17.x), hence the update to buildopts.py discovery

In the course of regenerating the github actions I also fixed a couple of issues that stopped regeneration matching repo contents
  * a few workflows were using workflow_dispatch, added support
  * there were a trailing and double spaces for project_prefix, fixed (use ignore whitespace to remove this from review!)

Reviewed By: bigfootjon, yfeldblum

Differential Revision: D78019509

fbshipit-source-id: f8b0e9438bfc6b481b4207ad82bc1002e496a2d9

Author: ahornby

build/fbcode_builder/getdeps.py

@@ -1015,6 +1015,8 @@ def get_run_on(self, args):
         if args.cron:
             if args.cron == "never":
                 return " {}"
+            elif args.cron == "workflow_dispatch":
+                return "\n  workflow_dispatch"
             else:
                 return f"""
   schedule:
@@ -1082,7 +1084,7 @@ def write_job_for_platform(self, platform, args):  # noqa: C901
             if args.runs_on:
                 runs_on = args.runs_on
             else:
-                runs_on = "windows-2019"
+                runs_on = "windows-2022"
             # The windows runners are python 3 by default; python2.exe
             # is available if needed.
             py3 = "python"
@@ -1324,7 +1326,7 @@ def write_job_for_platform(self, platform, args):  # noqa: C901
                 no_deps_arg = "--no-deps "
 
             out.write(
-                f"      run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{tests_arg}{no_deps_arg}--src-dir=. {manifest.name} {project_prefix}\n"
+                f"      run: {getdepscmd}{allow_sys_arg} build {build_type_arg}{tests_arg}{no_deps_arg}--src-dir=. {manifest.name}{project_prefix}\n"
             )
 
             out.write("    - name: Copy artifacts\n")
@@ -1339,7 +1341,7 @@ def write_job_for_platform(self, platform, args):  # noqa: C901
 
             out.write(
                 f"      run: {getdepscmd}{allow_sys_arg} fixup-dyn-deps{strip} "
-                f"--src-dir=. {manifest.name} _artifacts/{artifacts} {project_prefix} "
+                f"--src-dir=. {manifest.name} _artifacts/{artifacts}{project_prefix} "
                 f"--final-install-prefix /usr/local\n"
             )
 
@@ -1355,7 +1357,7 @@ def write_job_for_platform(self, platform, args):  # noqa: C901
 
                 out.write("    - name: Test %s\n" % manifest.name)
                 out.write(
-                    f"      run: {getdepscmd}{allow_sys_arg} test {num_jobs_arg}--src-dir=. {manifest.name} {project_prefix}\n"
+                    f"      run: {getdepscmd}{allow_sys_arg} test {num_jobs_arg}--src-dir=. {manifest.name}{project_prefix}\n"
                 )
             if build_opts.free_up_disk and not build_opts.is_windows():
                 out.write("    - name: Show disk space at end\n")

build/fbcode_builder/getdeps/buildopts.py

@@ -147,25 +147,43 @@ def __init__(
             # On Windows, the compiler is not available in the PATH by
             # default so we need to run the vcvarsall script to populate the
             # environment. We use a glob to find some version of this script
-            # as deployed with Visual Studio 2017.  This logic can also
-            # locate Visual Studio 2019 but note that at the time of writing
-            # the version of boost in our manifest cannot be built with
-            # VS 2019, so we're effectively tied to VS 2017 until we upgrade
-            # the boost dependency.
-            for year in ["2017", "2019"]:
-                vcvarsall += glob.glob(
-                    os.path.join(
-                        os.environ["ProgramFiles(x86)"],
-                        "Microsoft Visual Studio",
-                        year,
-                        "*",
-                        "VC",
-                        "Auxiliary",
-                        "Build",
-                        "vcvarsall.bat",
+            # as deployed with Visual Studio.
+            if len(vcvarsall) == 0:
+                # check the 64 bit installs
+                for year in ["2022"]:
+                    vcvarsall += glob.glob(
+                        os.path.join(
+                            os.environ.get("ProgramFiles", "C:\\Program Files"),
+                            "Microsoft Visual Studio",
+                            year,
+                            "*",
+                            "VC",
+                            "Auxiliary",
+                            "Build",
+                            "vcvarsall.bat",
+                        )
                     )
+
+                # then the 32 bit ones
+                for year in ["2019", "2017"]:
+                    vcvarsall += glob.glob(
+                        os.path.join(
+                            os.environ["ProgramFiles(x86)"],
+                            "Microsoft Visual Studio",
+                            year,
+                            "*",
+                            "VC",
+                            "Auxiliary",
+                            "Build",
+                            "vcvarsall.bat",
+                        )
+                    )
+            if len(vcvarsall) == 0:
+                raise Exception(
+                    "Could not find vcvarsall.bat. Please install Visual Studio."
                 )
             vcvars_path = vcvarsall[0]
+            print(f"Using vcvarsall.bat from {vcvars_path}", file=sys.stderr)
 
         self.vcvars_path = vcvars_path
 

build/fbcode_builder/getdeps/dyndeps.py

@@ -176,6 +176,12 @@ def find_dumpbin(self) -> str:
         # Looking for dumpbin in the following hardcoded paths.
         # The registry option to find the install dir doesn't work anymore.
         globs = [
+            (
+                "C:/Program Files/"
+                "Microsoft Visual Studio/"
+                "*/*/VC/Tools/"
+                "MSVC/*/bin/Hostx64/x64/dumpbin.exe"
+            ),
             (
                 "C:/Program Files (x86)/"
                 "Microsoft Visual Studio/"

build/fbcode_builder/manifests/boost

@@ -113,4 +113,4 @@ toolset=clang
 cxxflags="-DBOOST_UNORDERED_HAVE_PIECEWISE_CONSTRUCT=0"
 
 [b2.args.all(os=windows,fb=on)]
-toolset=msvc-14.2
+toolset=msvc-14.3