Mesa (main): ci: Disable windows-vs2019

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Feb 23 17:06:10 UTC 2022


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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Wed Feb 23 10:04:44 2022 -0500

ci: Disable windows-vs2019

Currently down.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15148>

---

 .gitlab-ci.yml                             | 10 +++++-----
 src/gallium/drivers/d3d12/ci/gitlab-ci.yml | 10 +++++-----
 src/microsoft/ci/gitlab-ci.yml             |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d86da81bec..157dd030cd3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -586,7 +586,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:
@@ -597,7 +597,7 @@ windows_build_vs2019:
     DOCKERFILE: Dockerfile_build
   timeout: 2h 30m # LLVM takes ages
 
-windows_test_vs2019:
+.windows_test_vs2019:
   inherit:
     default: false
   extends:
@@ -615,7 +615,7 @@ windows_test_vs2019:
   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:
@@ -626,7 +626,7 @@ windows_test_vs2019:
     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:
@@ -1080,7 +1080,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 4a93cb20972..7f3da192768 100644
--- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
@@ -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 @@ test-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
 
-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 7557fc219e3..78f1791cb62 100644
--- a/src/microsoft/ci/gitlab-ci.yml
+++ b/src/microsoft/ci/gitlab-ci.yml
@@ -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:



More information about the mesa-commit mailing list