aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2020-06-17 20:45:54 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2020-06-17 16:51:58 +0000
commit804cefc94cd334fccccdf3015eb0b3f589f87515 (patch)
tree88877047e905791c87496fc4ebcd5057b311c38d /ci
parentf7b751401409fb8036b084a7d1729d45e73fe6e6 (diff)
downloadmeson-804cefc94cd334fccccdf3015eb0b3f589f87515.zip
meson-804cefc94cd334fccccdf3015eb0b3f589f87515.tar.gz
meson-804cefc94cd334fccccdf3015eb0b3f589f87515.tar.bz2
ci: Remove PostgreSQL from PATH
It's one of the causes of the cmake test failures, and it's also plaguing the VS2019 jobs now because of the image update.
Diffstat (limited to 'ci')
-rw-r--r--ci/run.ps13
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/run.ps1 b/ci/run.ps1
index 34856c0..5065b87 100644
--- a/ci/run.ps1
+++ b/ci/run.ps1
@@ -4,7 +4,8 @@ if ($LastExitCode -ne 0) {
}
# remove Chocolately, MinGW, Strawberry Perl from path, so we don't find gcc/gfortran and try to use it
-$env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey' }) -join ';'
+# remove PostgreSQL from path so we don't pickup a broken zlib from it
+$env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey|PostgreSQL' }) -join ';'
# Rust puts its shared stdlib in a secret place, but it is needed to run tests.
$env:Path += ";$HOME/.rustup/toolchains/stable-x86_64-pc-windows-msvc/bin"