diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-06-17 20:45:54 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-06-17 20:45:54 +0530 |
| commit | 69cb6ff4a1a2f3805e26d8e8b4b74a036dc62222 (patch) | |
| tree | 88877047e905791c87496fc4ebcd5057b311c38d | |
| parent | f7b751401409fb8036b084a7d1729d45e73fe6e6 (diff) | |
| download | meson-nirbheek/dont-use-postgres-zlib.tar.gz | |
ci: Remove PostgreSQL from PATHnirbheek/dont-use-postgres-zlib
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.
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | ci/run.ps1 | 3 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/test.json | 5 | ||||
| -rw-r--r-- | test cases/cmake/5 object library/test.json | 7 |
4 files changed, 2 insertions, 15 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 65fc02091..04083427b 100644 --- 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 index 34856c0cd..5065b8749 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" diff --git a/test cases/cmake/2 advanced/test.json b/test cases/cmake/2 advanced/test.json index f4cb58b44..e12f530b8 100644 --- 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 deleted file mode 100644 index 1840ce4be..000000000 --- a/test cases/cmake/5 object library/test.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "matrix": { - "options": { - "_": [{"val": null, "skip_on_env": ["CI_JOB_VS2017"]}] - } - } -} |