ci/msvc: Rename vs2019 to msvc
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26736>
This commit is contained in:
@@ -411,7 +411,7 @@ debian/arm64_test:
|
||||
# (host PowerShell) in the container stage to build and push the image,
|
||||
# then in the build stage by executing inside Docker.
|
||||
|
||||
.windows-docker-vs2019:
|
||||
.windows-docker-msvc:
|
||||
variables:
|
||||
MESA_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_IMAGE_PATH}:${MESA_IMAGE_TAG}"
|
||||
MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
|
||||
@@ -423,7 +423,7 @@ debian/arm64_test:
|
||||
default: [retry]
|
||||
extends:
|
||||
- .container
|
||||
- .windows-docker-vs2019
|
||||
- .windows-docker-msvc
|
||||
- .windows-shell-tags
|
||||
rules:
|
||||
- !reference [.microsoft-farm-container-rules, rules]
|
||||
@@ -434,7 +434,7 @@ debian/arm64_test:
|
||||
script:
|
||||
- .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE ${DOCKERFILE} ${MESA_BASE_IMAGE}
|
||||
|
||||
windows_vs2019:
|
||||
windows_msvc:
|
||||
inherit:
|
||||
default: [retry]
|
||||
extends:
|
||||
@@ -445,7 +445,7 @@ windows_vs2019:
|
||||
DOCKERFILE: Dockerfile_vs
|
||||
MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022"
|
||||
|
||||
windows_build_vs2019:
|
||||
windows_build_msvc:
|
||||
inherit:
|
||||
default: [retry]
|
||||
extends:
|
||||
@@ -462,9 +462,9 @@ windows_build_vs2019:
|
||||
MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
|
||||
timeout: 2h 30m # LLVM takes ages
|
||||
needs:
|
||||
- windows_vs2019
|
||||
- windows_msvc
|
||||
|
||||
windows_test_vs2019:
|
||||
windows_test_msvc:
|
||||
inherit:
|
||||
default: [retry]
|
||||
extends:
|
||||
@@ -481,24 +481,24 @@ windows_test_vs2019:
|
||||
MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
|
||||
timeout: 2h 30m
|
||||
needs:
|
||||
- windows_vs2019
|
||||
- windows_msvc
|
||||
|
||||
.use-windows_build_vs2019:
|
||||
.use-windows_build_msvc:
|
||||
inherit:
|
||||
default: [retry]
|
||||
extends: .windows-docker-vs2019
|
||||
extends: .windows-docker-msvc
|
||||
image: "$MESA_IMAGE"
|
||||
variables:
|
||||
MESA_IMAGE_PATH: *windows_build_image_path
|
||||
MESA_IMAGE_TAG: *windows_build_image_tag
|
||||
MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
|
||||
needs:
|
||||
- windows_build_vs2019
|
||||
- windows_build_msvc
|
||||
|
||||
.use-windows_test_vs2019:
|
||||
.use-windows_test_msvc:
|
||||
inherit:
|
||||
default: [retry]
|
||||
extends: .windows-docker-vs2019
|
||||
extends: .windows-docker-msvc
|
||||
image: "$MESA_IMAGE"
|
||||
variables:
|
||||
MESA_IMAGE_PATH: *windows_test_image_path
|
||||
|
||||
Reference in New Issue
Block a user