From 2c56f6f3163d77f52741a6cd1416e319d7d43e2b Mon Sep 17 00:00:00 2001 From: v-agadekar Date: Tue, 28 Nov 2023 17:30:36 +0530 Subject: [PATCH 1/2] added mac image changes --- .azure-pipelines/azure-pipelines-create-release.yml | 2 +- .azure-pipelines/azure-pipelines-merge.yml | 12 ++++++------ .azure-pipelines/azure-pipelines-pr.yml | 12 ++++++------ azure-devops-cli-extension | 1 + 4 files changed, 14 insertions(+), 13 deletions(-) create mode 160000 azure-devops-cli-extension diff --git a/.azure-pipelines/azure-pipelines-create-release.yml b/.azure-pipelines/azure-pipelines-create-release.yml index bf9cf8c8..06863e37 100644 --- a/.azure-pipelines/azure-pipelines-create-release.yml +++ b/.azure-pipelines/azure-pipelines-create-release.yml @@ -41,7 +41,7 @@ jobs: - job: 'Run_Test' dependsOn : Build_Publish_Azure_CLI_Test_SDK pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - template: templates/run-tests.yml diff --git a/.azure-pipelines/azure-pipelines-merge.yml b/.azure-pipelines/azure-pipelines-merge.yml index 7d114597..9747f960 100644 --- a/.azure-pipelines/azure-pipelines-merge.yml +++ b/.azure-pipelines/azure-pipelines-merge.yml @@ -79,7 +79,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 +89,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 +100,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,7 +137,7 @@ jobs: - job: 'Run_Style_Check' pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - task: UsePythonVersion@0 @@ -162,7 +162,7 @@ jobs: - job: 'Run_HelpText_Check' dependsOn: 'Build_Publish_Azure_CLI_Test_SDK' pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - task: UsePythonVersion@0 @@ -189,7 +189,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 diff --git a/.azure-pipelines/azure-pipelines-pr.yml b/.azure-pipelines/azure-pipelines-pr.yml index fdf9a3de..770f4c7d 100644 --- a/.azure-pipelines/azure-pipelines-pr.yml +++ b/.azure-pipelines/azure-pipelines-pr.yml @@ -60,7 +60,7 @@ jobs: - job: 'Run_Test_Mac' dependsOn : Build_Publish_Azure_CLI_Test_SDK pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - template: templates/run-tests.yml @@ -70,7 +70,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 @@ -96,7 +96,7 @@ jobs: - job: 'Code_Coverage' dependsOn: 'Build_Publish_Azure_CLI_Test_SDK' pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - task: UsePythonVersion@0 @@ -133,7 +133,7 @@ jobs: - job: 'Run_Style_Check' pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - task: UsePythonVersion@0 @@ -161,7 +161,7 @@ jobs: - job: 'Run_HelpText_Check' dependsOn: 'Build_Publish_Azure_CLI_Test_SDK' pool: - vmImage: 'macOS-10.15' + vmImage: 'macOS-latest' steps: - task: UsePythonVersion@0 @@ -188,7 +188,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 diff --git a/azure-devops-cli-extension b/azure-devops-cli-extension new file mode 160000 index 00000000..0e887069 --- /dev/null +++ b/azure-devops-cli-extension @@ -0,0 +1 @@ +Subproject commit 0e887069b0e540f0dcb40605fecdb56f7ece02f9 From bca4eba45be92400d61bf83615b94ecfbea120d1 Mon Sep 17 00:00:00 2001 From: v-agadekar Date: Mon, 4 Dec 2023 11:07:33 +0530 Subject: [PATCH 2/2] Added mac image changes for cli --- .azure-pipelines/azure-pipelines-pr.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.azure-pipelines/azure-pipelines-pr.yml b/.azure-pipelines/azure-pipelines-pr.yml index 770f4c7d..ae48e2ca 100644 --- a/.azure-pipelines/azure-pipelines-pr.yml +++ b/.azure-pipelines/azure-pipelines-pr.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 @@ -140,6 +144,8 @@ jobs: inputs: versionSpec: '3.8' architecture: 'x64' + - script: pip install setuptools + displayName: 'install setuptools' - template: templates/install-azure-cli-edge.yml