3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

Update VMs for Patch Tuesday, 2021-08-11 (#19508)

Browse Source 
* Deploy SDKs with full features first to ensure we get Debugging Tools for Windows.

* Update VMs for Patch Tuesday, 2021-08-11
This commit is contained in:
Billy O'Neal 2021-08-13 16:12:24 -07:00 committed by GitHub
parent 801f40c688
commit e22f9d7d70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/azure-pipelines/azure-pipelines.yml
View File

@ -2,8 +2,8 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
variables: variables:
windows-pool: 'PrWin-2021-07-14' windows-pool: 'PrWin-2021-08-12'
linux-pool: 'PrLin-2021-07-14' linux-pool: 'PrLin-2021-08-11'
osx-pool: 'PrOsx-2021-07-27' osx-pool: 'PrOsx-2021-07-27'
stages: stages:

4
scripts/azure-pipelines/windows/create-vmss.ps1
View File

@ -362,11 +362,11 @@ function Invoke-ScriptWithPrefix {
} }
} }
Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1' -AddAdminPw
Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName
#################################################################################################### ####################################################################################################
Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-wdk.ps1' -AddAdminPw Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw
Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName
#################################################################################################### ####################################################################################################

20
scripts/azure-pipelines/windows/deploy-windows-wdk.ps1 → scripts/azure-pipelines/windows/deploy-windows-sdks.ps1
View File

@ -5,29 +5,27 @@
# REPLACE WITH UTILITY-PREFIX.ps1 # REPLACE WITH UTILITY-PREFIX.ps1
$WindowsWDKUrl = 'https://go.microsoft.com/fwlink/?linkid=2128854'
<# <#
.SYNOPSIS .SYNOPSIS
Installs Windows WDK version 2004 Installs Windows PSDK/WDK
.DESCRIPTION .DESCRIPTION
Downloads the Windows WDK installer located at $Url, and installs it with the Downloads the Windows PSDK/DDK installer located at $Url, and installs it with the
correct flags. correct flags.
.PARAMETER Url .PARAMETER Url
The URL of the installer. The URL of the installer.
#> #>
Function InstallWindowsWDK { Function InstallWindowsDK {
Param( Param(
[String]$Url [String]$Url
) )
try { try {
Write-Host 'Downloading Windows WDK...' Write-Host "Downloading Windows PSDK or DDK $Url..."
[string]$installerPath = Get-TempFilePath -Extension 'exe' [string]$installerPath = Get-TempFilePath -Extension 'exe'
curl.exe -L -o $installerPath -s -S $Url curl.exe -L -o $installerPath -s -S $Url
Write-Host 'Installing Windows WDK...' Write-Host 'Installing...'
$proc = Start-Process -FilePath $installerPath -ArgumentList @('/features', '+', '/q') -Wait -PassThru $proc = Start-Process -FilePath $installerPath -ArgumentList @('/features', '+', '/q') -Wait -PassThru
$exitCode = $proc.ExitCode $exitCode = $proc.ExitCode
if ($exitCode -eq 0) { if ($exitCode -eq 0) {
@ -39,9 +37,13 @@ Function InstallWindowsWDK {
} }
} }
catch { catch {
Write-Error "Failed to install Windows WDK! $($_.Exception.Message)" Write-Error "Failed to install Windows PSDK or DDK! $($_.Exception.Message)"
throw throw
} }
} }
InstallWindowsWDK -Url $WindowsWDKUrl # Windows 10 SDK, version 2004 (10.0.19041.0)
InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2120843'
# Windows 10 WDK, version 2004
InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2128854'

2
scripts/azure-pipelines/windows/provision-entire-image.ps1
View File

@ -4,8 +4,8 @@
. "$PSScriptRoot\utility-prefix.ps1" . "$PSScriptRoot\utility-prefix.ps1"
. "$PSScriptRoot\deploy-tlssettings.ps1" -RebootIfRequired 0 . "$PSScriptRoot\deploy-tlssettings.ps1" -RebootIfRequired 0
. "$PSScriptRoot\deploy-windows-sdks.ps1"
. "$PSScriptRoot\deploy-visual-studio.ps1" . "$PSScriptRoot\deploy-visual-studio.ps1"
. "$PSScriptRoot\deploy-windows-wdk.ps1"
. "$PSScriptRoot\deploy-mpi.ps1" . "$PSScriptRoot\deploy-mpi.ps1"
. "$PSScriptRoot\deploy-cuda.ps1" . "$PSScriptRoot\deploy-cuda.ps1"
. "$PSScriptRoot\deploy-inteloneapi.ps1" . "$PSScriptRoot\deploy-inteloneapi.ps1"