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.
pull/7328/head
Nirbheek Chauhan 5 years ago committed by Nirbheek Chauhan
parent f7b7514014
commit 804cefc94c
  1. 2
      azure-pipelines.yml
  2. 3
      ci/run.ps1
  3. 5
      test cases/cmake/2 advanced/test.json
  4. 7
      test cases/cmake/5 object library/test.json

@ -15,8 +15,6 @@ jobs:
- job: vs2017
pool:
vmImage: VS2017-Win2016
variables:
CI_JOB_VS2017: 1
strategy:
matrix:

@ -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"

@ -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"},

@ -1,7 +0,0 @@
{
"matrix": {
"options": {
"_": [{"val": null, "skip_on_env": ["CI_JOB_VS2017"]}]
}
}
}
Loading…
Cancel
Save