Module: Mesa Branch: main Commit: a2595dbf3bf3ccee005acb418680bec041a73c96 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a2595dbf3bf3ccee005acb418680bec041a73c96
Author: Yonggang Luo <[email protected]> Date: Tue Dec 19 06:37:48 2023 +0800 ci/msvc: Rename vs to msvc for consistence 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/container/gitlab-ci.yml | 18 +++++++++--------- .gitlab-ci/image-tags.yml | 4 ++-- .gitlab-ci/windows/{Dockerfile_vs => Dockerfile_msvc} | 4 ++-- .gitlab-ci/windows/mesa_build.ps1 | 2 +- .gitlab-ci/windows/mesa_deps_build.ps1 | 2 +- .gitlab-ci/windows/mesa_deps_test.ps1 | 2 +- .../windows/{mesa_vs_init.ps1 => mesa_init_msvc.ps1} | 0 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 351a2e9c513..7553ac48000 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -440,9 +440,9 @@ windows_msvc: extends: - .windows_container_build variables: - MESA_IMAGE_PATH: &windows_vs_image_path ${WINDOWS_X64_VS_PATH} - MESA_IMAGE_TAG: &windows_vs_image_tag ${WINDOWS_X64_VS_TAG} - DOCKERFILE: Dockerfile_vs + MESA_IMAGE_PATH: &windows_msvc_image_path ${WINDOWS_X64_MSVC_PATH} + MESA_IMAGE_TAG: &windows_msvc_image_tag ${WINDOWS_X64_MSVC_TAG} + DOCKERFILE: Dockerfile_msvc MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022" windows_build_msvc: @@ -457,8 +457,8 @@ windows_build_msvc: MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH} MESA_IMAGE_TAG: &windows_build_image_tag ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_BUILD_TAG} DOCKERFILE: Dockerfile_build - MESA_BASE_IMAGE_PATH: *windows_vs_image_path - MESA_BASE_IMAGE_TAG: *windows_vs_image_tag + MESA_BASE_IMAGE_PATH: *windows_msvc_image_path + MESA_BASE_IMAGE_TAG: *windows_msvc_image_tag MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}" timeout: 2h 30m # LLVM takes ages needs: @@ -476,8 +476,8 @@ windows_test_msvc: MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH} MESA_IMAGE_TAG: &windows_test_image_tag ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_TEST_TAG} DOCKERFILE: Dockerfile_test - MESA_BASE_IMAGE_PATH: *windows_vs_image_path - MESA_BASE_IMAGE_TAG: *windows_vs_image_tag + MESA_BASE_IMAGE_PATH: *windows_msvc_image_path + MESA_BASE_IMAGE_TAG: *windows_msvc_image_tag MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}" timeout: 2h 30m needs: @@ -491,7 +491,7 @@ windows_test_msvc: variables: MESA_IMAGE_PATH: *windows_build_image_path MESA_IMAGE_TAG: *windows_build_image_tag - MESA_BASE_IMAGE_TAG: *windows_vs_image_tag + MESA_BASE_IMAGE_TAG: *windows_msvc_image_tag needs: - windows_build_msvc @@ -503,4 +503,4 @@ windows_test_msvc: variables: MESA_IMAGE_PATH: *windows_test_image_path MESA_IMAGE_TAG: *windows_test_image_tag - MESA_BASE_IMAGE_TAG: *windows_vs_image_tag + MESA_BASE_IMAGE_TAG: *windows_msvc_image_tag diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 8b7e22b0a6d..4d2dd8858bb 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -29,8 +29,8 @@ variables: KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_REPO: "gfx-ci/linux" - WINDOWS_X64_VS_PATH: "windows/x64_vs" - WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" + WINDOWS_X64_MSVC_PATH: "windows/x64_vs" + WINDOWS_X64_MSVC_TAG: "2022-10-20-upgrade-zlib" WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_TAG: "2023-12-07-directx-headers-611" diff --git a/.gitlab-ci/windows/Dockerfile_vs b/.gitlab-ci/windows/Dockerfile_msvc similarity index 87% rename from .gitlab-ci/windows/Dockerfile_vs rename to .gitlab-ci/windows/Dockerfile_msvc index 759611ab7a5..b1e1c0a5ae9 100644 --- a/.gitlab-ci/windows/Dockerfile_vs +++ b/.gitlab-ci/windows/Dockerfile_msvc @@ -18,12 +18,12 @@ RUN C:\mesa_deps_msvc.ps1 COPY mesa_deps_choco.ps1 C:\ RUN C:\mesa_deps_choco.ps1 -COPY mesa_vs_init.ps1 C:\ +COPY mesa_init_msvc.ps1 C:\ # Example usage: # `base_image` should use windows image that can be run with `--isolation=process` option, # since the resulting container will want to be used that way be later containers in the build process. # Only --isolation=hyperv can succeed building this container locally, # --isolation=process have network issue when installing Visual Studio and choco will crash -# docker build --isolation=hyperv -f .\Dockerfile_vs -t mesa_vs --build-arg base_image="mcr.microsoft.com/windows:10.0.19041.1415" . +# docker build --isolation=hyperv -f .\Dockerfile_msvc -t mesa_vs --build-arg base_image="mcr.microsoft.com/windows:10.0.19041.1415" . diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 index a54c180d853..bfdda384cc0 100644 --- a/.gitlab-ci/windows/mesa_build.ps1 +++ b/.gitlab-ci/windows/mesa_build.ps1 @@ -30,7 +30,7 @@ Write-Output installdir:$installdir Write-Output sourcedir:$sourcedir $MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent -. "$MyPath\mesa_vs_init.ps1" +. "$MyPath\mesa_init_msvc.ps1" $depsInstallPath="C:\mesa-deps" diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index b360678c29e..a140fdd1858 100644 --- a/.gitlab-ci/windows/mesa_deps_build.ps1 +++ b/.gitlab-ci/windows/mesa_deps_build.ps1 @@ -1,6 +1,6 @@ $MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent -. "$MyPath\mesa_vs_init.ps1" +. "$MyPath\mesa_init_msvc.ps1" # we want more secure TLS 1.2 for most things, but it breaks SourceForge # downloads so must be done after Chocolatey use diff --git a/.gitlab-ci/windows/mesa_deps_test.ps1 b/.gitlab-ci/windows/mesa_deps_test.ps1 index c9d86b2590a..21f0f627cdb 100644 --- a/.gitlab-ci/windows/mesa_deps_test.ps1 +++ b/.gitlab-ci/windows/mesa_deps_test.ps1 @@ -2,7 +2,7 @@ Get-Date Write-Host "Cloning Waffle" $MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent -. "$MyPath\mesa_vs_init.ps1" +. "$MyPath\mesa_init_msvc.ps1" git clone --no-progress --single-branch --no-checkout https://gitlab.freedesktop.org/mesa/waffle.git 'C:\src\waffle' if (!$?) { diff --git a/.gitlab-ci/windows/mesa_vs_init.ps1 b/.gitlab-ci/windows/mesa_init_msvc.ps1 similarity index 100% rename from .gitlab-ci/windows/mesa_vs_init.ps1 rename to .gitlab-ci/windows/mesa_init_msvc.ps1
