NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ci/msvc: Rename vs to msvc for consistence

Browse source 
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:
Yonggang Luo 2023-12-19 06:37:48 +08:00 • committed by Marge Bot
parent 4d6d0a24ed
commit a2595dbf3b
7 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.gitlab-ci/container/gitlab-ci.yml
View file

@ -440,9 +440,9 @@ windows_msvc:
extends: extends:
- .windows_container_build - .windows_container_build
variables: variables:
MESA_IMAGE_PATH: &windows_vs_image_path ${WINDOWS_X64_VS_PATH} MESA_IMAGE_PATH: &windows_msvc_image_path ${WINDOWS_X64_MSVC_PATH}
MESA_IMAGE_TAG: &windows_vs_image_tag ${WINDOWS_X64_VS_TAG} MESA_IMAGE_TAG: &windows_msvc_image_tag ${WINDOWS_X64_MSVC_TAG}
DOCKERFILE: Dockerfile_vs DOCKERFILE: Dockerfile_msvc
MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022" MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022"
windows_build_msvc: windows_build_msvc:
@ -457,8 +457,8 @@ windows_build_msvc:
MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH} 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 ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_BUILD_TAG}
DOCKERFILE: Dockerfile_build DOCKERFILE: Dockerfile_build
MESA_BASE_IMAGE_PATH: *windows_vs_image_path MESA_BASE_IMAGE_PATH: *windows_msvc_image_path
MESA_BASE_IMAGE_TAG: *windows_vs_image_tag 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}:${MESA_BASE_IMAGE_TAG}"
timeout: 2h 30m # LLVM takes ages timeout: 2h 30m # LLVM takes ages
needs: needs:
@ -476,8 +476,8 @@ windows_test_msvc:
MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH} 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 ${MESA_BASE_IMAGE_TAG}--${WINDOWS_X64_TEST_TAG}
DOCKERFILE: Dockerfile_test DOCKERFILE: Dockerfile_test
MESA_BASE_IMAGE_PATH: *windows_vs_image_path MESA_BASE_IMAGE_PATH: *windows_msvc_image_path
MESA_BASE_IMAGE_TAG: *windows_vs_image_tag 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}:${MESA_BASE_IMAGE_TAG}"
timeout: 2h 30m timeout: 2h 30m
needs: needs:
@ -491,7 +491,7 @@ windows_test_msvc:
variables: variables:
MESA_IMAGE_PATH: *windows_build_image_path MESA_IMAGE_PATH: *windows_build_image_path
MESA_IMAGE_TAG: *windows_build_image_tag MESA_IMAGE_TAG: *windows_build_image_tag
MESA_BASE_IMAGE_TAG: *windows_vs_image_tag MESA_BASE_IMAGE_TAG: *windows_msvc_image_tag
needs: needs:
- windows_build_msvc - windows_build_msvc
@ -503,4 +503,4 @@ windows_test_msvc:
variables: variables:
MESA_IMAGE_PATH: *windows_test_image_path MESA_IMAGE_PATH: *windows_test_image_path
MESA_IMAGE_TAG: *windows_test_image_tag MESA_IMAGE_TAG: *windows_test_image_tag
MESA_BASE_IMAGE_TAG: *windows_vs_image_tag MESA_BASE_IMAGE_TAG: *windows_msvc_image_tag

4
.gitlab-ci/image-tags.yml
View file

@ -29,8 +29,8 @@ variables:
KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
KERNEL_REPO: "gfx-ci/linux" KERNEL_REPO: "gfx-ci/linux"
WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_MSVC_PATH: "windows/x64_vs"
WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" WINDOWS_X64_MSVC_TAG: "2022-10-20-upgrade-zlib"
WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_PATH: "windows/x64_build"
WINDOWS_X64_BUILD_TAG: "2023-12-07-directx-headers-611" WINDOWS_X64_BUILD_TAG: "2023-12-07-directx-headers-611"

4
.gitlab-ci/windows/Dockerfile_vs → .gitlab-ci/windows/Dockerfile_msvc
View file

@ -18,12 +18,12 @@ RUN C:\mesa_deps_msvc.ps1
COPY mesa_deps_choco.ps1 C:\ COPY mesa_deps_choco.ps1 C:\
RUN C:\mesa_deps_choco.ps1 RUN C:\mesa_deps_choco.ps1
COPY mesa_vs_init.ps1 C:\ COPY mesa_init_msvc.ps1 C:\
# Example usage: # Example usage:
# `base_image` should use windows image that can be run with `--isolation=process` option, # `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. # 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, # Only --isolation=hyperv can succeed building this container locally,
# --isolation=process have network issue when installing Visual Studio and choco will crash # --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" .

2
.gitlab-ci/windows/mesa_build.ps1
View file

@ -30,7 +30,7 @@ Write-Output installdir:$installdir
Write-Output sourcedir:$sourcedir Write-Output sourcedir:$sourcedir
$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent $MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
. "$MyPath\mesa_vs_init.ps1" . "$MyPath\mesa_init_msvc.ps1"
$depsInstallPath="C:\mesa-deps" $depsInstallPath="C:\mesa-deps"

2
.gitlab-ci/windows/mesa_deps_build.ps1
View file

@ -1,6 +1,6 @@
$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent $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 # we want more secure TLS 1.2 for most things, but it breaks SourceForge
# downloads so must be done after Chocolatey use # downloads so must be done after Chocolatey use

2
.gitlab-ci/windows/mesa_deps_test.ps1
View file

@ -2,7 +2,7 @@ Get-Date
Write-Host "Cloning Waffle" Write-Host "Cloning Waffle"
$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent $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' git clone --no-progress --single-branch --no-checkout https://gitlab.freedesktop.org/mesa/waffle.git 'C:\src\waffle'
if (!$?) { if (!$?) {

0
.gitlab-ci/windows/mesa_vs_init.ps1 → .gitlab-ci/windows/mesa_init_msvc.ps1
View file