Mesa (main): ci/windows: Eliminate duplicate script definition
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Apr 21 12:49:42 UTC 2022
Module: Mesa
Branch: main
Commit: ec4baed0eeff7c679c213b4a97bfe885cfb910e9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec4baed0eeff7c679c213b4a97bfe885cfb910e9
Author: Daniel Stone <daniels at collabora.com>
Date: Wed Apr 20 22:16:44 2022 +0100
ci/windows: Eliminate duplicate script definition
We already get this from the base we extend from.
Signed-off-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16077>
---
.gitlab-ci/container/gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index aa4580bb30a..7ef0727feb3 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -394,8 +394,6 @@ windows_test_vs2019:
MESA_BASE_IMAGE_PATH: *windows_build_image_path
MESA_BASE_IMAGE_TAG: *windows_build_image_tag
MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
- 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
More information about the mesa-commit
mailing list