From 6828dcf0b40e582aa43ed9ac3d87ab16d190f49a Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Sun, 9 Aug 2020 22:07:46 +0200 Subject: [PATCH] Use preinstalled diffutils 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 f6f3edf98..852ebe911 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,12 +66,12 @@ portable-source: - git submodule update --init # Install and set PATH - choco install --no-progress -y grep - - choco install --no-progress -y diffutils - $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" + - $Env:Path += ";$env:CI_PROJECT_DIR\windows\dependencies\graphviz-build-utilities\GnuWin\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 0c6939dbf..3e0ad3bda 160000 --- a/windows/dependencies/graphviz-build-utilities +++ b/windows/dependencies/graphviz-build-utilities @@ -1 +1 @@ -Subproject commit 0c6939dbf420eb1c623b349717aed10db9a06dae +Subproject commit 3e0ad3bda050b7cf791edd135fd7bdbc221bdf3c -- 2.40.0