]> granicus.if.org Git - graphviz/commitdiff
Use preinstalled nsis instead of installing it in CI
authorMagnus Jacobsson <magnus.jacobsson@berotec.se>
Sun, 9 Aug 2020 04:52:51 +0000 (06:52 +0200)
committerMagnus Jacobsson <magnus.jacobsson@berotec.se>
Sun, 9 Aug 2020 04:52:51 +0000 (06:52 +0200)
.gitlab-ci.yml
windows/dependencies/graphviz-build-utilities

index 49d6949afeb618e5086ed43aacd27d969457d3a9..d64f7888f42699a9543e70e3fe0e1b5078108cef 100644 (file)
@@ -77,12 +77,10 @@ portable-source:
         # 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"
-        - $Env:Path += ";C:\Program Files (x86)\NSIS\Bin"
         - $Env:graphviz_install_dir = "C:\Graphviz"
         # Build
         - >-
             if($env:build_system -eq "cmake") {
-              choco install --no-progress -y NSIS;
               mkdir build;
               cd build;
               cmake -G "$env:generator" -A $Env:platform ..;
index 050fff84ce195e0740878748760fd801eeb07b23..e5640a35facd34a01657027064f4972c70a60d72 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 050fff84ce195e0740878748760fd801eeb07b23
+Subproject commit e5640a35facd34a01657027064f4972c70a60d72