github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Where applicable, update Windows pools used to azsdk-pool-mms-win-2022-general and rename vmImage to the windows-20xx format (#4360)

Browse Source
This commit is contained in:
Konrad Jamrozik 2023-02-16 19:02:10 -08:00 committed by GitHub
parent b1efed36d5
commit 971d20be3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/pipelines/daily-verification.yml
View File

@ -4,7 +4,7 @@ jobs:
displayName: Daily vcpkg PR
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
variables:
# The branch in the azure-sdk/vcpkg repo that is updated daily with the

4
eng/pipelines/templates/jobs/archetype-sdk-client.yml
View File

@ -69,7 +69,7 @@ jobs:
displayName: Create API Review for ${{ artifact.name }}
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
steps:
- task: Powershell@2
inputs:
@ -111,7 +111,7 @@ jobs:
- job: GenerateReleaseArtifacts
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
variables:
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
Package.EnableSBOMSigning: true

10
eng/pipelines/templates/stages/archetype-cpp-release.yml
View File

@ -22,7 +22,7 @@ stages:
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
strategy:
runOnce:
@ -63,7 +63,7 @@ stages:
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
strategy:
runOnce:
@ -93,7 +93,7 @@ stages:
dependsOn: TagRepository
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
variables:
VcpkgPrRepoOwner: Microsoft
@ -220,7 +220,7 @@ stages:
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
strategy:
runOnce:
@ -248,7 +248,7 @@ stages:
pool:
name: azsdk-pool-mms-win-2022-general
vmImage: MMS2022
vmImage: windows-2022
steps:
- checkout: self

2
eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
View File

@ -10,7 +10,7 @@
},
"Windows": {
"Pool": "azsdk-pool-mms-win-2022-general",
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"VCPKG_DEFAULT_TRIPLET": "x64-windows"
},
"Mac": {

2
eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
View File

@ -3,7 +3,7 @@
"OSConfig": {
"Windows": {
"Pool": "azsdk-pool-mms-win-2022-general",
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"CmakeEnvArg": ""
},
"Linux": {

4
eng/pipelines/templates/stages/platform-matrix-live.json
View File

@ -71,12 +71,12 @@
"StaticConfigs": {
"Win2019": {
"Pool": "azsdk-pool-mms-win-2019-general",
"OSVmImage": "MMS2019",
"OSVmImage": "windows-2019",
"CMAKE_GENERATOR": "Visual Studio 16 2019"
},
"Win2022": {
"Pool": "azsdk-pool-mms-win-2022-general",
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"CMAKE_GENERATOR": "Visual Studio 17 2022"
}
},

6
eng/pipelines/templates/stages/platform-matrix.json
View File

@ -31,7 +31,7 @@
{
"StaticConfigs": {
"Win2019_x64_Release": {
"OSVmImage": "MMS2019",
"OSVmImage": "windows-2019",
"Pool": "azsdk-pool-mms-win-2019-general",
"CMAKE_GENERATOR": "Visual Studio 16 2019",
"CMAKE_GENERATOR_PLATFORM": "x64",
@ -49,7 +49,7 @@
{
"StaticConfigs": {
"Win2022": {
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"Pool": "azsdk-pool-mms-win-2022-general",
"CMAKE_GENERATOR": "Visual Studio 17 2022"
}
@ -106,7 +106,7 @@
"StaticConfigs": {
"Win2022": {
"VcpkgInstall": "openssl",
"OSVmImage": "MMS2022",
"OSVmImage": "windows-2022",
"Pool": "azsdk-pool-mms-win-2022-general",
"CMAKE_GENERATOR": "Visual Studio 17 2022",
"PublishMapFiles": "true"

4
eng/scripts/Get-BinarySizes.ps1
View File

@ -48,11 +48,11 @@ function getTargetOs {
return $OsVMImage
}
if ($OsVMImage -match "^MMS2019$|^win-2019$") {
if ($OsVMImage -eq "windows-2019") {
return "win-2019"
}
if ($OsVMImage -match "^MMS2022$|^win-2022$|^windows-2022$") {
if ($OsVMImage -eq "windows-2022") {
return "win-2022"
}