ci/msvc: Rename vs to msvc for consistence
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:
@@ -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" .
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 (!$?) {
|
||||
|
||||
Reference in New Issue
Block a user