ci: Disable Windows for now

Docker on Windows is broken for some reason, so just disable it for now.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14970>
This commit is contained in:
Daniel Stone 2022-02-10 12:47:42 +00:00
parent 137e170bcb
commit be385ab5bc
3 changed files with 6 additions and 6 deletions

View File

@ -589,7 +589,7 @@ debian/arm_test:
script: script:
- .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE ${DOCKERFILE} ${MESA_BASE_IMAGE} - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE ${DOCKERFILE} ${MESA_BASE_IMAGE}
windows_build_vs2019: .windows_build_vs2019:
inherit: inherit:
default: false default: false
extends: extends:
@ -600,7 +600,7 @@ windows_build_vs2019:
DOCKERFILE: Dockerfile_build DOCKERFILE: Dockerfile_build
timeout: 2h 30m # LLVM takes ages timeout: 2h 30m # LLVM takes ages
windows_test_vs2019: .windows_test_vs2019:
inherit: inherit:
default: false default: false
extends: extends:
@ -1079,7 +1079,7 @@ debian-clang:
CC: clang CC: clang
CXX: clang++ CXX: clang++
windows-vs2019: .windows-vs2019:
extends: extends:
- .build-windows - .build-windows
- .use-windows_build_vs2019 - .use-windows_build_vs2019

View File

@ -25,7 +25,7 @@
- summary/ - summary/
- result.txt - result.txt
test-d3d12-quick_gl: .test-d3d12-quick_gl:
extends: extends:
- .d3d12-test-piglit - .d3d12-test-piglit
variables: variables:
@ -33,7 +33,7 @@ test-d3d12-quick_gl:
PIGLIT_RESULTS: "d3d12-quick_gl" PIGLIT_RESULTS: "d3d12-quick_gl"
PIGLIT_TESTS: -x nv_copy_depth_to_color -x glsl-1.30.execution.tex-miplevel-selection -x arb_timer_query.timestamp-get PIGLIT_TESTS: -x nv_copy_depth_to_color -x glsl-1.30.execution.tex-miplevel-selection -x arb_timer_query.timestamp-get
test-d3d12-quick_shader: .test-d3d12-quick_shader:
extends: extends:
- .d3d12-test-piglit - .d3d12-test-piglit
variables: variables:

View File

@ -1,4 +1,4 @@
test-spirv2dxil-windows: .test-spirv2dxil-windows:
extends: extends:
- .build-windows - .build-windows
- .use-windows_test_vs2019 - .use-windows_test_vs2019