From 9eb429273c582f4eec354024e43f12ee953a72a8 Mon Sep 17 00:00:00 2001 From: v-anvashist Date: Wed, 6 Dec 2023 10:00:38 +0530 Subject: [PATCH 1/2] macimagechanges --- .azure-pipelines/azure-pipelines-merge.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-merge.yml b/.azure-pipelines/azure-pipelines-merge.yml index 7d114597..6cbdb9ea 100644 --- a/.azure-pipelines/azure-pipelines-merge.yml +++ b/.azure-pipelines/azure-pipelines-merge.yml @@ -19,6 +19,8 @@ jobs: inputs: versionSpec: '3.x' architecture: 'x64' + - script: pip install setuptools + displayName: 'install setuptools' - template: templates/setup-ci-machine.yml @@ -33,6 +35,8 @@ jobs: inputs: versionSpec: '3.x' architecture: 'x64' + - script: pip install setuptools + displayName: 'install setuptools' - template: templates/setup-ci-machine.yml @@ -79,7 +83,7 @@ jobs: - job: 'Run_Test_Mac' dependsOn: ['Build_Publish_Azure_CLI_Test_SDK','Build_Publish_Azure_DevOps_CLI_Extension'] pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - template: templates/run-tests.yml @@ -89,7 +93,7 @@ jobs: - job: 'Run_Test_Mac_Azure_CLI_Released_Version' dependsOn : Build_Publish_Azure_CLI_Test_SDK pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - template: templates/run-tests.yml @@ -100,7 +104,7 @@ jobs: - job: 'Code_Coverage' dependsOn: 'Build_Publish_Azure_CLI_Test_SDK' pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - task: UsePythonVersion@0 @@ -137,12 +141,12 @@ jobs: - job: 'Run_Style_Check' pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.x' + versionSpec: '3.8' architecture: 'x64' - template: templates/install-azure-cli-edge.yml @@ -162,12 +166,12 @@ jobs: - job: 'Run_HelpText_Check' dependsOn: 'Build_Publish_Azure_CLI_Test_SDK' pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.x' + versionSpec: '3.10' architecture: 'x64' - template: templates/install-azure-cli-edge.yml @@ -189,7 +193,7 @@ jobs: - job: 'Run_Test_From_Old_Release' dependsOn : Build_Publish_Azure_CLI_Test_SDK pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - script: git checkout Releases-0.26.0 From 5e37b88e03fd48d0d2fb2ec0707c488af9508a71 Mon Sep 17 00:00:00 2001 From: v-anvashist Date: Wed, 6 Dec 2023 11:24:08 +0530 Subject: [PATCH 2/2] Machanges --- .azure-pipelines/azure-pipelines-merge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-merge.yml b/.azure-pipelines/azure-pipelines-merge.yml index 6cbdb9ea..4bfbebd4 100644 --- a/.azure-pipelines/azure-pipelines-merge.yml +++ b/.azure-pipelines/azure-pipelines-merge.yml @@ -88,7 +88,7 @@ jobs: steps: - template: templates/run-tests.yml parameters: - pythonVersion: '3.x' + pythonVersion: '3.10' - job: 'Run_Test_Mac_Azure_CLI_Released_Version' dependsOn : Build_Publish_Azure_CLI_Test_SDK @@ -98,7 +98,7 @@ jobs: steps: - template: templates/run-tests.yml parameters: - pythonVersion: '3.x' + pythonVersion: '3.10' runWithAzureCliReleased: 'true' - job: 'Code_Coverage' @@ -109,7 +109,7 @@ jobs: steps: - task: UsePythonVersion@0 inputs: - versionSpec: '3.x' + versionSpec: '3.10' architecture: 'x64' - template: templates/install-azure-cli-edge.yml @@ -200,7 +200,7 @@ jobs: - template: templates/run-tests.yml parameters: - pythonVersion: '3.x' + pythonVersion: '3.10' runOnlyRecordedTests: 'true' - job: 'Check_Back_Compat_Arguments'