mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 11:21:12 +08:00
Patch Tuesday for May 2024 (#38802)
This commit is contained in:
parent
f33c86152c
commit
6bc37f3520
@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:1.4
|
# syntax=docker/dockerfile:1.4
|
||||||
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
|
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
|
||||||
FROM ubuntu:focal-20240216
|
FROM ubuntu:focal-20240427
|
||||||
|
|
||||||
ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
|
ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
|
||||||
ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip
|
ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip
|
||||||
|
@ -2,11 +2,7 @@
|
|||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
#
|
#
|
||||||
variables:
|
variables:
|
||||||
linux-pool: 'PrLin-1ES-Pool'
|
linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-05-17'
|
||||||
windows-pool: 'PrWin-1ES'
|
|
||||||
osx-pool: 'PrOsx-2024-01-18'
|
|
||||||
osx-arm64-pool: 'PrOsx-2024-01-22-arm64'
|
|
||||||
linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-04-11'
|
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
- name: vcpkgToolSha
|
- name: vcpkgToolSha
|
||||||
@ -37,70 +33,62 @@ jobs:
|
|||||||
- template: windows/azure-pipelines.yml
|
- template: windows/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: x86_windows
|
jobName: x86_windows
|
||||||
poolName: $(windows-pool)
|
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: windows/azure-pipelines.yml
|
- template: windows/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: x64_windows
|
jobName: x64_windows
|
||||||
poolName: $(windows-pool)
|
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: windows/azure-pipelines.yml
|
- template: windows/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: x64_windows_static
|
jobName: x64_windows_static
|
||||||
poolName: $(windows-pool)
|
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: windows/azure-pipelines.yml
|
- template: windows/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: x64_windows_static_md
|
jobName: x64_windows_static_md
|
||||||
poolName: $(windows-pool)
|
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: windows/azure-pipelines.yml
|
- template: windows/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: x64_uwp
|
jobName: x64_uwp
|
||||||
poolName: $(windows-pool)
|
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: windows/azure-pipelines.yml
|
- template: windows/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: arm64_windows
|
jobName: arm64_windows
|
||||||
poolName: $(windows-pool)
|
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: windows/azure-pipelines.yml
|
- template: windows/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: arm64_uwp
|
jobName: arm64_uwp
|
||||||
poolName: $(windows-pool)
|
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: osx/azure-pipelines.yml
|
- template: osx/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: x64_osx
|
jobName: x64_osx
|
||||||
poolName: $(osx-pool)
|
poolName: 'PrOsx-2024-01-18'
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: osx/azure-pipelines.yml
|
- template: osx/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: arm64_osx
|
jobName: arm64_osx
|
||||||
poolName: $(osx-arm64-pool)
|
poolName: 'PrOsx-2024-01-22-arm64'
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
- template: linux/azure-pipelines.yml
|
- template: linux/azure-pipelines.yml
|
||||||
parameters:
|
parameters:
|
||||||
jobName: x64_linux
|
jobName: x64_linux
|
||||||
poolName: $(linux-pool)
|
|
||||||
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
|
||||||
tripletPattern: ${{ parameters.tripletPattern }}
|
tripletPattern: ${{ parameters.tripletPattern }}
|
||||||
|
|
||||||
|
@ -10,8 +10,6 @@ parameters:
|
|||||||
- name: jobName
|
- name: jobName
|
||||||
type: string
|
type: string
|
||||||
default: 'x64_linux'
|
default: 'x64_linux'
|
||||||
- name: poolName
|
|
||||||
type: string
|
|
||||||
- name: tripletPattern
|
- name: tripletPattern
|
||||||
displayName: 'Enable the triplets which contain this substring'
|
displayName: 'Enable the triplets which contain this substring'
|
||||||
type: string
|
type: string
|
||||||
@ -21,7 +19,7 @@ jobs:
|
|||||||
- job: x64_linux
|
- job: x64_linux
|
||||||
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
|
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
|
||||||
pool:
|
pool:
|
||||||
name: ${{ parameters.poolName }}
|
name: PrLin-1ES-Pool
|
||||||
workspace:
|
workspace:
|
||||||
clean: resources
|
clean: resources
|
||||||
timeoutInMinutes: 1440 # 1 day
|
timeoutInMinutes: 1440 # 1 day
|
||||||
|
@ -10,8 +10,6 @@ parameters:
|
|||||||
- name: jobName
|
- name: jobName
|
||||||
type: string
|
type: string
|
||||||
default: 'x86_windows'
|
default: 'x86_windows'
|
||||||
- name: poolName
|
|
||||||
type: string
|
|
||||||
- name: tripletPattern
|
- name: tripletPattern
|
||||||
displayName: 'Enable the triplets which contain this substring'
|
displayName: 'Enable the triplets which contain this substring'
|
||||||
type: string
|
type: string
|
||||||
@ -21,7 +19,8 @@ jobs:
|
|||||||
- job: ${{ parameters.jobName }}
|
- job: ${{ parameters.jobName }}
|
||||||
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
|
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
|
||||||
pool:
|
pool:
|
||||||
name: ${{ parameters.poolName }}
|
name: PrWin-1ES
|
||||||
|
demands: ImageVersionOverride -equals 2024.05.20
|
||||||
workspace:
|
workspace:
|
||||||
clean: resources
|
clean: resources
|
||||||
timeoutInMinutes: 2880 # 2 days
|
timeoutInMinutes: 2880 # 2 days
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
$azcopyZipPath = "$PSScriptRoot\azcopyv10.zip"
|
$azcopyZipPath = "$PSScriptRoot\azcopyv10.zip"
|
||||||
& curl.exe -L -o $azcopyZipPath 'https://azcopyvnext.azureedge.net/releases/release-10.23.0-20240129/azcopy_windows_amd64_10.23.0.zip'
|
& curl.exe -L -o $azcopyZipPath 'https://azcopyvnext.azureedge.net/releases/release-10.24.0-20240326/azcopy_windows_amd64_10.24.0.zip'
|
||||||
Expand-Archive -LiteralPath $azcopyZipPath -DestinationPath $env:PROGRAMFILES
|
Expand-Archive -LiteralPath $azcopyZipPath -DestinationPath $env:PROGRAMFILES
|
||||||
Remove-Item -LiteralPath $azcopyZipPath -Force
|
Remove-Item -LiteralPath $azcopyZipPath -Force
|
||||||
|
@ -5,5 +5,5 @@
|
|||||||
|
|
||||||
# REPLACE WITH UTILITY-PREFIX.ps1
|
# REPLACE WITH UTILITY-PREFIX.ps1
|
||||||
|
|
||||||
$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/PowerShell-7.4.1-win-x64.msi'
|
$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.2/PowerShell-7.4.2-win-x64.msi'
|
||||||
InstallMSI -Url $PwshUrl -Name 'PowerShell Core'
|
InstallMSI -Url $PwshUrl -Name 'PowerShell Core'
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# REPLACE WITH UTILITY-PREFIX.ps1
|
# REPLACE WITH UTILITY-PREFIX.ps1
|
||||||
|
|
||||||
# See https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history
|
# See https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history
|
||||||
$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/ec7bd8ef-2c51-4e4f-a83f-9087ffbe8b76/f7fdf51d7c15b65c60f0f358776576f4423417da603ef46a213bd69ad463e9e2/vs_Enterprise.exe'
|
$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/a8a3940c-d415-4078-8df8-6af787f56dfa/ff486670bce61323e52b208ecbb71dc05b034c8bf156d0b7bfc0ad67b2611445/vs_Enterprise.exe'
|
||||||
$Workloads = @(
|
$Workloads = @(
|
||||||
'Microsoft.VisualStudio.Workload.NativeDesktop',
|
'Microsoft.VisualStudio.Workload.NativeDesktop',
|
||||||
'Microsoft.VisualStudio.Workload.Universal',
|
'Microsoft.VisualStudio.Workload.Universal',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user