Mesa (main): Revert "ci: Disable Windows for now"

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 7a0ace7d4ed6e99f133149bb38fab2ee4f63d1a3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a0ace7d4ed6e99f133149bb38fab2ee4f63d1a3

Author: Daniel Stone <daniels at collabora.com>
Date:   Thu Feb 10 15:15:01 2022 +0000

Revert "ci: Disable Windows for now"

This reverts commit be385ab5bcba60e30c8c980ae595e1e69a888393.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14975>

---

 .gitlab-ci.yml                             | 6 +++---
 src/gallium/drivers/d3d12/ci/gitlab-ci.yml | 4 ++--
 src/microsoft/ci/gitlab-ci.yml             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 425ca1678c5..d33dcf5168a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
index 1a52d9b5b8a..4a93cb20972 100644
--- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
@@ -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:
diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml
index 0fb5d8721ec..7557fc219e3 100644
--- a/src/microsoft/ci/gitlab-ci.yml
+++ b/src/microsoft/ci/gitlab-ci.yml
@@ -1,4 +1,4 @@
-.test-spirv2dxil-windows:
+test-spirv2dxil-windows:
   extends:
     - .build-windows
     - .use-windows_test_vs2019