Module: Mesa Branch: main Commit: 25a560b6226c3d44b42507769a7316dacf8b685f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25a560b6226c3d44b42507769a7316dacf8b685f
Author: Yonggang Luo <[email protected]> Date: Wed Dec 20 10:20:13 2023 +0800 ci/msvc: Remove &windows_msvc_image_tag This is hard to understand and complicated 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 | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 7553ac48000..55c47d0fef0 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -441,7 +441,7 @@ windows_msvc: - .windows_container_build variables: MESA_IMAGE_PATH: &windows_msvc_image_path ${WINDOWS_X64_MSVC_PATH} - MESA_IMAGE_TAG: &windows_msvc_image_tag ${WINDOWS_X64_MSVC_TAG} + MESA_IMAGE_TAG: ${WINDOWS_X64_MSVC_TAG} DOCKERFILE: Dockerfile_msvc MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022" @@ -455,11 +455,10 @@ windows_build_msvc: - !reference [.container+build-rules, rules] variables: 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} + MESA_IMAGE_TAG: &windows_build_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_BUILD_TAG} DOCKERFILE: Dockerfile_build 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}" + MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${WINDOWS_X64_MSVC_TAG}" timeout: 2h 30m # LLVM takes ages needs: - windows_msvc @@ -474,11 +473,10 @@ windows_test_msvc: - !reference [.container+build-rules, rules] variables: 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} + MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_MSVC_TAG}--${WINDOWS_X64_TEST_TAG} DOCKERFILE: Dockerfile_test 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}" + MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${WINDOWS_X64_MSVC_TAG}" timeout: 2h 30m needs: - windows_msvc @@ -491,7 +489,6 @@ windows_test_msvc: variables: MESA_IMAGE_PATH: *windows_build_image_path MESA_IMAGE_TAG: *windows_build_image_tag - MESA_BASE_IMAGE_TAG: *windows_msvc_image_tag needs: - windows_build_msvc @@ -503,4 +500,3 @@ windows_test_msvc: variables: MESA_IMAGE_PATH: *windows_test_image_path MESA_IMAGE_TAG: *windows_test_image_tag - MESA_BASE_IMAGE_TAG: *windows_msvc_image_tag
