From: Daniel Stone Date: Mon, 24 Aug 2020 19:41:19 +0000 (+0100) Subject: CI: Re-enable VS2019 build X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e13f803afac1a2d5e06e0c0670d1d82821ed7a0;p=mesa.git 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 Reviewed-by: Erik Faye-Lund Part-of: --- 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