Use preinstalled perl instead of installing it in CI

One more step towards https://gitlab.com/graphviz/graphviz/-/issues/1759.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df3b4d3a9db93685b1c70043c1d3f7741961493a..a5ccb6a146b5d541d369ec1317ba6d1285650b6c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,7 +65,6 @@ portable-source:
         # Retrieve submodules, dependencies are stored there.
         - git submodule update --init
         # Install and set PATH
-        - choco install --no-progress -y activeperl
         - 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
@@ -75,6 +74,7 @@ portable-source:
         - 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"
         # 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"

diff --git a/windows/dependencies/graphviz-build-utilities b/windows/dependencies/graphviz-build-utilities
index 36610512f1feef0bc68fec16333ab68e28066496..ec9bbb85178325e2453acb6825e6880275be60e5 160000 (submodule)
--- a/windows/dependencies/graphviz-build-utilities
+++ b/windows/dependencies/graphviz-build-utilities
@@ -1 +1 @@
-Subproject commit 36610512f1feef0bc68fec16333ab68e28066496
+Subproject commit ec9bbb85178325e2453acb6825e6880275be60e5