Module: Mesa Branch: main Commit: 4d6d0a24ed01263f118286b098ac8aecd9a49a92 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d6d0a24ed01263f118286b098ac8aecd9a49a92
Author: Yonggang Luo <[email protected]> Date: Tue Dec 19 06:30:32 2023 +0800 ci/msvc: Rename vs2019 to msvc Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26736> --- .gitlab-ci/build/gitlab-ci.yml | 4 ++-- .gitlab-ci/container/gitlab-ci.yml | 24 +++++++++++----------- .gitlab-ci/windows/Dockerfile_vs | 4 ++-- .../{mesa_deps_vs2019.ps1 => mesa_deps_msvc.ps1} | 0 src/gallium/drivers/d3d12/ci/gitlab-ci.yml | 8 ++++---- src/microsoft/ci/gitlab-ci.yml | 16 +++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index ed4d0bffb89..2913a3389e4 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -553,10 +553,10 @@ debian-clang-release: -D opencl-spirv=true -D shared-glapi=disabled -windows-vs2019: +windows-msvc: extends: - .build-windows - - .use-windows_build_vs2019 + - .use-windows_build_msvc - .windows-build-rules stage: build-misc script: diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 54f5f739682..351a2e9c513 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -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 diff --git a/.gitlab-ci/windows/Dockerfile_vs b/.gitlab-ci/windows/Dockerfile_vs index 5e1c9566500..759611ab7a5 100644 --- a/.gitlab-ci/windows/Dockerfile_vs +++ b/.gitlab-ci/windows/Dockerfile_vs @@ -12,8 +12,8 @@ RUN powershell -ExecutionPolicy RemoteSigned -Command "$ErrorActionPreference = SHELL ["pwsh", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"] RUN Write-Output $PSVersionTable $ErrorActionPreference -COPY mesa_deps_vs2019.ps1 C:\ -RUN C:\mesa_deps_vs2019.ps1 +COPY mesa_deps_msvc.ps1 C:\ +RUN C:\mesa_deps_msvc.ps1 COPY mesa_deps_choco.ps1 C:\ RUN C:\mesa_deps_choco.ps1 diff --git a/.gitlab-ci/windows/mesa_deps_vs2019.ps1 b/.gitlab-ci/windows/mesa_deps_msvc.ps1 similarity index 100% rename from .gitlab-ci/windows/mesa_deps_vs2019.ps1 rename to .gitlab-ci/windows/mesa_deps_msvc.ps1 diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml index 2dbdcab1802..53cc431c4f1 100644 --- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml +++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml @@ -1,13 +1,13 @@ .d3d12-test: extends: - - .use-windows_test_vs2019 + - .use-windows_test_msvc - .glon12-test-rules stage: layered-backends dependencies: - - windows-vs2019 + - windows-msvc needs: - - windows-vs2019 - - windows_test_vs2019 + - windows-msvc + - windows_test_msvc - !reference [.required-for-hardware-jobs, needs] variables: GIT_STRATEGY: none # testing doesn't build anything from source diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml index b2c60cd10eb..51674bdb066 100644 --- a/src/microsoft/ci/gitlab-ci.yml +++ b/src/microsoft/ci/gitlab-ci.yml @@ -3,14 +3,14 @@ include: test-spirv2dxil-windows: extends: - - .use-windows_test_vs2019 + - .use-windows_test_msvc - .spirv2dxil-test-rules stage: layered-backends dependencies: - - windows-vs2019 + - windows-msvc needs: - - windows-vs2019 - - windows_test_vs2019 + - windows-msvc + - windows_test_msvc - !reference [.required-for-hardware-jobs, needs] variables: GIT_STRATEGY: none # testing doesn't build anything from source @@ -24,14 +24,14 @@ test-spirv2dxil-windows: test-dozen-deqp: extends: - - .use-windows_test_vs2019 + - .use-windows_test_msvc - .dozen-test-rules stage: layered-backends dependencies: - - windows-vs2019 + - windows-msvc needs: - - windows-vs2019 - - windows_test_vs2019 + - windows-msvc + - windows_test_msvc - !reference [.required-for-hardware-jobs, needs] variables: GIT_STRATEGY: none # testing doesn't build anything from source
