diff options
| author | Daniel Stone <daniels@collabora.com> | 2020-04-16 14:56:18 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-04-16 22:40:24 +0000 |
| commit | 791134658e30ed843acd68d39b06156563017d15 (patch) | |
| tree | 9f3de2faa00c8b7db2fb07672066393fabef1710 /.gitlab-ci.yml | |
| parent | 2f009c4b494f5b158525e7ebc01c280f54227402 (diff) | |
Revert "CI: Disable Windows/VS2019 builds"
DNS is now fixed.
This reverts commit 460b8b1758d953b2b820443615d73ccdb1455b5e.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4591>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9b7c3ee8da..c2b73bca927 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,7 +214,7 @@ arm_test: WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:$WINDOWS_TAG" WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:$WINDOWS_TAG" -.windows_build_vs2019: +windows_build_vs2019: extends: - .container - .windows-docker-vs2019 @@ -233,7 +233,7 @@ arm_test: extends: .windows-docker-vs2019 image: "$WINDOWS_IMAGE" needs: - - .windows_build_vs2019 + - windows_build_vs2019 # BUILD @@ -438,7 +438,7 @@ meson-clang: CC: "ccache clang-9" CXX: "ccache clang++-9" -.meson-windows-vs2019: +meson-windows-vs2019: extends: - .build-windows - .use-windows_build_vs2019 |