diff options
| author | Daniel Stone <daniels@collabora.com> | 2020-08-24 20:41:19 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-08-28 10:15:40 +0000 |
| commit | 0e13f803afac1a2d5e06e0c0670d1d82821ed7a0 (patch) | |
| tree | 2d03e158314f7c1548d5d9446d5288c81256a0ad /.gitlab-ci.yml | |
| parent | a2808108e8052efc7c51236117155e7478464c8b (diff) | |
CI: Re-enable VS2019 build
Now that we have a more powerful runner and a more stable Docker
configuration, try re-enabling the Windows build.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6446>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8911789086..2909d304e14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -382,7 +382,7 @@ arm64_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 @@ -684,7 +684,7 @@ meson-clang: CC: "ccache clang-9" CXX: "ccache clang++-9" -.meson-windows-vs2019: +meson-windows-vs2019: extends: - .build-windows - .use-windows_build_vs2019 |