diff --git a/windows-release/azure-pipelines.yml b/windows-release/azure-pipelines.yml index 0e8a6148..9f87474c 100644 --- a/windows-release/azure-pipelines.yml +++ b/windows-release/azure-pipelines.yml @@ -116,6 +116,10 @@ parameters: displayName: "Build the JIT compiler for free-threaded builds (not used yet)" type: boolean default: false +- name: vmImage + displayName: "VM Image" + type: string + default: windows-2025 resources: pipelines: @@ -156,6 +160,8 @@ stages: - ${{ if and(eq(parameters.BuildToPublish, 'current'), eq(parameters.BuildToPackage, 'current')) }}: - stage: Build displayName: Build binaries + pool: + vmImage: ${{ parameters.vmImage }} jobs: - template: stage-build.yml parameters: @@ -180,6 +186,8 @@ stages: - stage: Sign displayName: Sign binaries dependsOn: Build + pool: + vmImage: ${{ parameters.vmImage }} jobs: - template: stage-sign.yml parameters: @@ -194,6 +202,8 @@ stages: ${{ else }}: displayName: Generate layouts from prior build dependsOn: [] + pool: + vmImage: ${{ parameters.vmImage }} jobs: - template: stage-layout-full.yml parameters: @@ -232,6 +242,8 @@ stages: - stage: Pack dependsOn: Layout displayName: Pack + pool: + vmImage: ${{ parameters.vmImage }} jobs: #- ${{ if eq(parameters.DoEmbed, 'true') }}: # - template: stage-pack-embed.yml @@ -263,6 +275,8 @@ stages: - stage: Test dependsOn: Pack + pool: + vmImage: ${{ parameters.vmImage }} jobs: - ${{ if eq(parameters.DoEmbed, 'true') }}: - template: stage-test-embed.yml @@ -286,6 +300,8 @@ stages: dependsOn: - ${{ if eq(parameters.BuildToPublish, 'current') }}: - Test + pool: + vmImage: ${{ parameters.vmImage }} jobs: - ${{ if eq(parameters.DoPyManager, 'true') }}: - template: stage-publish-pymanager.yml diff --git a/windows-release/stage-build.yml b/windows-release/stage-build.yml index a76aa472..1433b8ea 100644 --- a/windows-release/stage-build.yml +++ b/windows-release/stage-build.yml @@ -10,8 +10,6 @@ parameters: jobs: - job: Build_Docs displayName: Docs build - pool: - vmImage: windows-2022 workspace: clean: all @@ -40,9 +38,6 @@ jobs: - job: Build_Python displayName: Python build - pool: - vmImage: windows-2022 - workspace: clean: all @@ -176,9 +171,6 @@ jobs: - job: Build_Python_PGO_Native displayName: Python PGO build - pool: - vmImage: windows-2022 - workspace: clean: all @@ -219,9 +211,6 @@ jobs: - job: Build_Python_PGO_1 displayName: Python PGO build - pool: - vmImage: windows-2022 - workspace: clean: all @@ -299,9 +288,6 @@ jobs: displayName: Merge PGO profile dependsOn: Build_Python_PGO_2 - pool: - vmImage: windows-2022 - workspace: clean: all @@ -339,9 +325,6 @@ jobs: - job: TclTk_Lib displayName: Publish Tcl/Tk Library - pool: - vmImage: windows-2022 - variables: IncludeLLVM: false diff --git a/windows-release/stage-layout-embed.yml b/windows-release/stage-layout-embed.yml index 4f077f86..6380e4d1 100644 --- a/windows-release/stage-layout-embed.yml +++ b/windows-release/stage-layout-embed.yml @@ -6,9 +6,6 @@ jobs: - job: Make_Embed_Layout displayName: Make embeddable layout - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-layout-full.yml b/windows-release/stage-layout-full.yml index 75917add..4839666e 100644 --- a/windows-release/stage-layout-full.yml +++ b/windows-release/stage-layout-full.yml @@ -7,9 +7,6 @@ jobs: - job: Make_Layouts displayName: Make layouts - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-layout-msix.yml b/windows-release/stage-layout-msix.yml index 54dcf3d6..16df4133 100644 --- a/windows-release/stage-layout-msix.yml +++ b/windows-release/stage-layout-msix.yml @@ -6,9 +6,6 @@ jobs: - job: Make_MSIX_Layout displayName: Make MSIX layout - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-layout-nuget.yml b/windows-release/stage-layout-nuget.yml index 0cabcb9b..a1fb8782 100644 --- a/windows-release/stage-layout-nuget.yml +++ b/windows-release/stage-layout-nuget.yml @@ -7,9 +7,6 @@ jobs: - job: Make_Nuget_Layout displayName: Make Nuget layout - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-layout-pymanager.yml b/windows-release/stage-layout-pymanager.yml index 5bae2f5f..2aeaf143 100644 --- a/windows-release/stage-layout-pymanager.yml +++ b/windows-release/stage-layout-pymanager.yml @@ -9,9 +9,6 @@ jobs: - job: Make_PyManager_Layouts displayName: Make PyManager layouts - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-layout-symbols.yml b/windows-release/stage-layout-symbols.yml index a890b51d..a1268a40 100644 --- a/windows-release/stage-layout-symbols.yml +++ b/windows-release/stage-layout-symbols.yml @@ -22,9 +22,6 @@ jobs: - job: Layout_Symbols displayName: Make symbols layout - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-msi.yml b/windows-release/stage-msi.yml index 52904662..4342a470 100644 --- a/windows-release/stage-msi.yml +++ b/windows-release/stage-msi.yml @@ -8,9 +8,6 @@ jobs: - job: Make_MSI displayName: Make MSI - pool: - vmImage: windows-2022 - variables: - ${{ if eq(parameters.SigningCertificate, 'PythonSoftwareFoundation') }}: - group: CPythonSign diff --git a/windows-release/stage-pack-msix.yml b/windows-release/stage-pack-msix.yml index 53bfa800..cb732b09 100644 --- a/windows-release/stage-pack-msix.yml +++ b/windows-release/stage-pack-msix.yml @@ -5,9 +5,6 @@ jobs: - job: Pack_MSIX displayName: Pack MSIX bundles - pool: - vmImage: windows-2022 - workspace: clean: all @@ -95,9 +92,6 @@ jobs: dependsOn: - Pack_MSIX - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-pack-nuget.yml b/windows-release/stage-pack-nuget.yml index 2a0ab657..cc9735a9 100644 --- a/windows-release/stage-pack-nuget.yml +++ b/windows-release/stage-pack-nuget.yml @@ -6,9 +6,6 @@ jobs: - job: Pack_Nuget displayName: Pack Nuget bundles - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-pack-pymanager.yml b/windows-release/stage-pack-pymanager.yml index 30966514..84fc6911 100644 --- a/windows-release/stage-pack-pymanager.yml +++ b/windows-release/stage-pack-pymanager.yml @@ -27,9 +27,6 @@ jobs: - job: Pack_PyManager displayName: Pack PyManager bundle - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-publish-nugetorg.yml b/windows-release/stage-publish-nugetorg.yml index e0dc889d..0b5db4e4 100644 --- a/windows-release/stage-publish-nugetorg.yml +++ b/windows-release/stage-publish-nugetorg.yml @@ -6,9 +6,6 @@ jobs: displayName: Publish Nuget packages condition: and(succeeded(), ne(variables['SkipNugetPublish'], 'true')) - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-publish-pymanager.yml b/windows-release/stage-publish-pymanager.yml index a5a3df6b..f24f5073 100644 --- a/windows-release/stage-publish-pymanager.yml +++ b/windows-release/stage-publish-pymanager.yml @@ -29,9 +29,6 @@ jobs: displayName: Publish PyManager packages to python.org condition: and(succeeded(), ne(variables['SkipPythonOrgPublish'], 'true')) - pool: - vmImage: windows-2022 - variables: - group: PythonOrgPublish diff --git a/windows-release/stage-publish-pythonorg.yml b/windows-release/stage-publish-pythonorg.yml index b6cdfc56..58d5fd7c 100644 --- a/windows-release/stage-publish-pythonorg.yml +++ b/windows-release/stage-publish-pythonorg.yml @@ -9,9 +9,6 @@ jobs: displayName: Publish python.org packages condition: and(succeeded(), ne(variables['SkipPythonOrgPublish'], 'true')) - pool: - vmImage: windows-2022 - variables: - group: PythonOrgPublish diff --git a/windows-release/stage-sign.yml b/windows-release/stage-sign.yml index 3a888414..a611e424 100644 --- a/windows-release/stage-sign.yml +++ b/windows-release/stage-sign.yml @@ -9,9 +9,6 @@ jobs: - job: Sign_Files displayName: Sign Python binaries - pool: - vmImage: windows-2022 - workspace: clean: all @@ -80,9 +77,6 @@ jobs: - job: Mark_Unsigned displayName: Tag unsigned build - pool: - vmImage: windows-2022 - steps: - checkout: none diff --git a/windows-release/stage-test-embed.yml b/windows-release/stage-test-embed.yml index 293c5336..a42fa5ef 100644 --- a/windows-release/stage-test-embed.yml +++ b/windows-release/stage-test-embed.yml @@ -2,9 +2,6 @@ jobs: - job: Test_Embed displayName: Test Embed - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-test-msi.yml b/windows-release/stage-test-msi.yml index 3b02a5ed..abf4a408 100644 --- a/windows-release/stage-test-msi.yml +++ b/windows-release/stage-test-msi.yml @@ -5,9 +5,6 @@ jobs: - job: Test_MSI displayName: Test MSI - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-test-nuget.yml b/windows-release/stage-test-nuget.yml index 670a2e32..9ab4b48e 100644 --- a/windows-release/stage-test-nuget.yml +++ b/windows-release/stage-test-nuget.yml @@ -2,9 +2,6 @@ jobs: - job: Test_Nuget displayName: Test Nuget - pool: - vmImage: windows-2022 - workspace: clean: all diff --git a/windows-release/stage-test-pymanager.yml b/windows-release/stage-test-pymanager.yml index a1f44583..667a6700 100644 --- a/windows-release/stage-test-pymanager.yml +++ b/windows-release/stage-test-pymanager.yml @@ -6,9 +6,6 @@ jobs: - job: Test_PyManager displayName: Test PyManager - pool: - vmImage: windows-2022 - workspace: clean: all