Revert "ci: Disable windows-vs2019"

This reverts commit 04b80489d5.

Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15518>
This commit is contained in:
Boris Brezillon 2022-03-22 11:53:16 +01:00 committed by Marge Bot
parent aa0c543533
commit 04d812b2d0
3 changed files with 14 additions and 14 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:
@ -618,7 +618,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_test ${MESA_BASE_IMAGE}
needs:
- .windows_build_vs2019
- windows_build_vs2019
.use-windows_build_vs2019:
inherit:
@ -629,7 +629,7 @@ debian/arm_test:
MESA_IMAGE_PATH: *windows_build_image_path
MESA_IMAGE_TAG: *windows_build_image_tag
needs:
- .windows_build_vs2019
- windows_build_vs2019
.use-windows_test_vs2019:
inherit:
@ -1089,7 +1089,7 @@ debian-clang:
CC: clang
CXX: clang++
.windows-vs2019:
windows-vs2019:
extends:
- .build-windows
- .use-windows_build_vs2019

View File

@ -5,10 +5,10 @@
- .windows-test-rules
stage: layered-backends
dependencies:
- .windows-vs2019
- windows-vs2019
needs:
- .windows-vs2019
- .windows_test_vs2019
- windows-vs2019
- windows_test_vs2019
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
GALLIUM_DRIVER: d3d12
@ -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,14 +1,14 @@
.test-spirv2dxil-windows:
test-spirv2dxil-windows:
extends:
- .build-windows
- .use-windows_test_vs2019
- .windows-test-rules
stage: layered-backends
dependencies:
- .windows-vs2019
- windows-vs2019
needs:
- .windows-vs2019
- .windows_test_vs2019
- windows-vs2019
- windows_test_vs2019
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
script: