From 5ea3935e55040d5b56811ca1b464aff0b7e3821e Mon Sep 17 00:00:00 2001
From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Sun, 9 Aug 2020 15:39:51 +0200
Subject: [PATCH] Use preinstalled Python 3 instead of installing it in CI

One more step towards https://gitlab.com/graphviz/graphviz/-/issues/1759.
---
 .gitlab-ci.yml                                | 8 +++-----
 windows/dependencies/graphviz-build-utilities | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5ccb6a14..b89ff9074 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,19 +65,17 @@ portable-source:
         # Retrieve submodules, dependencies are stored there.
         - git submodule update --init
         # Install and set PATH
-        - choco install --no-progress -y python3
-        - C:\ProgramData\chocolatey\tools\shimgen.exe -o=C:\Python38\python3.exe -p=C:\Python38\python.exe
         - choco install --no-progress -y grep
         - choco install --no-progress -y diffutils
-        - $Env:Path += ";C:\Python38"
-        - $Env:Path += ";C:\Python38\Scripts"
-        - pip install pytest
         - $Env:Path += ";$env:CI_PROJECT_DIR\windows\dependencies\graphviz-build-utilities"
         - $Env:Path += ";$env:CI_PROJECT_DIR\windows\dependencies\graphviz-build-utilities\NSIS\Bin"
         - $Env:Path += ";$env:CI_PROJECT_DIR\windows\dependencies\graphviz-build-utilities\Perl64\bin"
+        - $Env:Path += ";$env:CI_PROJECT_DIR\windows\dependencies\graphviz-build-utilities\Python38-32"
+        - $Env:Path += ";$env:CI_PROJECT_DIR\windows\dependencies\graphviz-build-utilities\Python38-32\Scripts"
         # CMake's cpack must be before Chocolatey's in the path
         - $Env:Path = "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;$Env:Path"
         - $Env:Path += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin"
+        - python3 -m pip install pytest
         - $Env:graphviz_install_dir = "C:\Graphviz"
         # Build
         - >-
diff --git a/windows/dependencies/graphviz-build-utilities b/windows/dependencies/graphviz-build-utilities
index ec9bbb851..18866be5e 160000
--- a/windows/dependencies/graphviz-build-utilities
+++ b/windows/dependencies/graphviz-build-utilities
@@ -1 +1 @@
-Subproject commit ec9bbb85178325e2453acb6825e6880275be60e5
+Subproject commit 18866be5e6588ba86fe80f1c9d1d2724f2246ff4
-- 
2.40.0