Revert "ci: Disable Windows for now"

This reverts commit be385ab5bc.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14975>
This commit is contained in:
Daniel Stone 2022-02-10 15:15:01 +00:00 committed by Marge Bot
parent c2168f845e
commit 7a0ace7d4e
3 changed files with 6 additions and 6 deletions

View File

@ -589,7 +589,7 @@ debian/arm_test:
script:
- .\.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:
default: false
extends:
@ -600,7 +600,7 @@ debian/arm_test:
DOCKERFILE: Dockerfile_build
timeout: 2h 30m # LLVM takes ages
.windows_test_vs2019:
windows_test_vs2019:
inherit:
default: false
extends:
@ -1079,7 +1079,7 @@ debian-clang:
CC: clang
CXX: clang++
.windows-vs2019:
windows-vs2019:
extends:
- .build-windows
- .use-windows_build_vs2019

View File

@ -25,7 +25,7 @@
- summary/
- result.txt
.test-d3d12-quick_gl:
test-d3d12-quick_gl:
extends:
- .d3d12-test-piglit
variables:
@ -33,7 +33,7 @@
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
.test-d3d12-quick_shader:
test-d3d12-quick_shader:
extends:
- .d3d12-test-piglit
variables:

View File

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