From 0966949c4b846846f6745e20987d7e8934df3205 Mon Sep 17 00:00:00 2001
From: John Demme <john.demme@microsoft.com>
Date: Fri, 17 May 2024 23:58:30 +0000
Subject: [PATCH] pipeline debug

---
 .github/workflows/pycdePublish.yml |  4 ++++
 frontends/PyCDE/setup.py           | 22 +++++++++-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pycdePublish.yml b/.github/workflows/pycdePublish.yml
index 7d625daa88dd..73af008cd33d 100644
--- a/.github/workflows/pycdePublish.yml
+++ b/.github/workflows/pycdePublish.yml
@@ -120,6 +120,10 @@ jobs:
           python3 -m pip install cibuildwheel twine
 
           choco install ninja sccache
+      - name: Build zlib
+        shell: pwsh
+        run: |
+          & "${VCPKG_INSTALLATION_ROOT}/vcpkg" install zlib:x64-windows-static
       - name: Build wheel
         env:
           CIBW_BUILD: ${{ matrix.python-env }}
diff --git a/frontends/PyCDE/setup.py b/frontends/PyCDE/setup.py
index c5561fbe22b5..a41d7e20ddf9 100644
--- a/frontends/PyCDE/setup.py
+++ b/frontends/PyCDE/setup.py
@@ -78,9 +78,12 @@ def run(self):
       cmake_args += [f"-DCMAKE_C_COMPILER={os.environ['CC']}"]
     if "CXX" in os.environ:
       cmake_args += [f"-DCMAKE_CXX_COMPILER={os.environ['CXX']}"]
-
     if "CIRCT_EXTRA_CMAKE_ARGS" in os.environ:
       cmake_args += os.environ["CIRCT_EXTRA_CMAKE_ARGS"].split(" ")
+    if "VCPKG_INSTALLATION_ROOT" in os.environ:
+      cmake_args += [
+          f"-DCMAKE_TOOLCHAIN_FILE={os.environ['VCPKG_INSTALLATION_ROOT']}/scripts/buildsystems/vcpkg.cmake"
+      ]
     build_args = []
     build_parallelism = os.getenv("CMAKE_PARALLELISM")
     if build_parallelism:
@@ -96,26 +99,19 @@ def run(self):
     print(f"Running cmake with args: {cmake_args}", file=sys.stderr)
     subprocess.check_call(["echo", "Running: cmake", src_dir] + cmake_args)
     subprocess.check_call(["cmake", src_dir] + cmake_args, cwd=cmake_build_dir)
+    targets = ["check-pycde"]
+    if "RUN_TESTS" in os.environ and os.environ["RUN_TESTS"] != "false":
+      targets.append("check-pycde-integration")
+      targets.append("check-circt")
     subprocess.check_call([
         "cmake",
         "--build",
         ".",
         "--verbose",
         "--target",
-        "check-pycde",
-    ] + build_args,
+    ] + targets + build_args,
                           cwd=cmake_build_dir)
 
-    if "RUN_TESTS" in os.environ and os.environ["RUN_TESTS"] != "false":
-      subprocess.check_call([
-          "cmake",
-          "--build",
-          ".",
-          "--target",
-          "check-pycde-integration",
-          "check-circt",
-      ] + build_args,
-                            cwd=cmake_build_dir)
     install_cmd = ["cmake", "--build", ".", "--target", "install-PyCDE"]
     subprocess.check_call(install_cmd + build_args, cwd=cmake_build_dir)
     shutil.copytree(os.path.join(cmake_install_dir, "python_packages"),