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.
philj56 · Jun 17, 2020 · 804cefc · 804cefc
1 parent f7b7514
commit 804cefc
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -15,8 +15,6 @@ jobs:
 - job: vs2017
   pool:
     vmImage: VS2017-Win2016
-  variables:
-    CI_JOB_VS2017: 1
 
   strategy:
     matrix:

diff --git 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"

diff --git a/test cases/cmake/2 advanced/test.json b/test cases/cmake/2 advanced/test.json
@@ -1,9 +1,4 @@
 {
-  "matrix": {
-    "options": {
-      "_": [{"val": null, "skip_on_env": ["CI_JOB_VS2017"]}]
-    }
-  },
   "installed": [
     {"type": "expr", "file": "usr/?lib/libcm_cmModLib?so"},
     {"type": "implib", "platform": "cygwin", "file": "usr/lib/libcm_cmModLib"},

diff --git a/test cases/cmake/5 object library/test.json b/test cases/cmake/5 object library/test.json