From b1c21d9c2e2c6d69620fac712878f9100281810e Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Fri, 7 Aug 2020 11:17:46 +0200 Subject: [PATCH] Use preinstalled perl instead of installing it in CI One more step towards https://gitlab.com/graphviz/graphviz/-/issues/1759. --- .gitlab-ci.yml | 2 +- windows/dependencies/graphviz-build-utilities | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df3b4d3a9..a5ccb6a14 100644 --- 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 36610512f..ec9bbb851 160000 --- a/windows/dependencies/graphviz-build-utilities +++ b/windows/dependencies/graphviz-build-utilities @@ -1 +1 @@ -Subproject commit 36610512f1feef0bc68fec16333ab68e28066496 +Subproject commit ec9bbb85178325e2453acb6825e6880275be60e5 -- 2.40.0