Commit c6d5fee8 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'gitlab-ci-msvc-version' into release

6f0c1760 gitlab-ci: allow failure for testing
ac3ba69c

 gitlab-ci: use the MSVC 14.28 toolchain
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !803
parents 9608586e 6f0c1760
...@@ -219,6 +219,8 @@ test:windows-vs2019-mpi: ...@@ -219,6 +219,8 @@ test:windows-vs2019-mpi:
- build:windows-vs2019-mpi - build:windows-vs2019-mpi
needs: needs:
- build:windows-vs2019-mpi - build:windows-vs2019-mpi
# OpenGL context are not being created properly. Investigation needed.
allow_failure: true
upload:windows-vs2019-mpi: upload:windows-vs2019-mpi:
extends: extends:
...@@ -253,6 +255,8 @@ test:windows-vs2019-nompi: ...@@ -253,6 +255,8 @@ test:windows-vs2019-nompi:
- build:windows-vs2019-nompi - build:windows-vs2019-nompi
needs: needs:
- build:windows-vs2019-nompi - build:windows-vs2019-nompi
# OpenGL context are not being created properly. Investigation needed.
allow_failure: true
upload:windows-vs2019-nompi: upload:windows-vs2019-nompi:
extends: extends:
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
variables: variables:
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64" VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.26" VCVARSVERSION: "14.28"
.windows_vs2019_mpi: .windows_vs2019_mpi:
extends: .windows_vs2019 extends: .windows_vs2019
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
.windows_builder_tags: .windows_builder_tags:
tags: tags:
- paraview # Since this is a bare runner, pin to a project. - paraview # Since this is a bare runner, pin to a project.
- msvc-19.26 - msvc-19.28
- nonconcurrent - nonconcurrent
- shell - shell
- vs2019 - vs2019
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment