Mesa (main): Revert "ci: disable vs2019 windows build"
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jan 12 22:17:21 UTC 2022
Module: Mesa
Branch: main
Commit: 56886459c5b5ea101a4d3943f9f7724ec8bc1c09
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=56886459c5b5ea101a4d3943f9f7724ec8bc1c09
Author: Daniel Stone <daniels at collabora.com>
Date: Wed Jan 12 12:57:32 2022 +0000
Revert "ci: disable vs2019 windows build"
This reverts commit 567a9550d78a92815e7075eda42c38519b73c0b2.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14513>
---
.gitlab-ci.yml | 4 ++--
src/gallium/drivers/d3d12/ci/gitlab-ci.yml | 4 ++--
src/microsoft/ci/gitlab-ci.yml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f45ed1f8450..bb9e9ade757 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -575,7 +575,7 @@ debian/arm_test:
MESA_IMAGE_TAG: "2021-11-19-piglit-uprev"
MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
-.windows_build_vs2019:
+windows_build_vs2019:
inherit:
default: false
extends:
@@ -1043,7 +1043,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 6ecac42b8b8..43743bc68c3 100644
--- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
@@ -24,7 +24,7 @@
- summary/
- result.txt
-.test-d3d12-quick_gl:
+test-d3d12-quick_gl:
extends:
- .d3d12-test-piglit
variables:
@@ -32,7 +32,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 f87b5badee4..c67037ca44d 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_build_vs2019
More information about the mesa-commit
mailing list