From 253f78a86afb3ba737b706cc4b29086aef7a99fe Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 15:14:01 -0500 Subject: [PATCH 01/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c2d087be..637d6f9a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,6 +63,28 @@ jobs: artifactName: 'pros_cli-$(Build.BuildNumber)-macos-$(buildArch)' targetPath: 'out' +- job: macOS M1 + timeoutInMinutes: 30 + dependsOn: UpdateBuildNumber + strategy: + maxParallel: 2 + matrix: + x64: + buildArch: x64 + pool: + M1 Mac + steps: + - task: UsePythonVersion@0 + inputs: + versionSpec: $(python.version) + architecture: $(buildArch) + - bash: scripts/build.sh + displayName: Build + - task: PublishPipelineArtifact@0 + inputs: + artifactName: 'pros_cli-$(Build.BuildNumber)-macos-$(buildArch)' + targetPath: 'out' + - job: Linux timeoutInMinutes: 30 dependsOn: UpdateBuildNumber From 8ff350924c279c7e2b204c407dd68cf78b276e26 Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 15:18:00 -0500 Subject: [PATCH 02/10] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 637d6f9a..626bedbe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ jobs: artifactName: 'pros_cli-$(Build.BuildNumber)-macos-$(buildArch)' targetPath: 'out' -- job: macOS M1 +- job: macOSM1 timeoutInMinutes: 30 dependsOn: UpdateBuildNumber strategy: From 792486c5759d7eba10e15ed1bb0276c9597a03eb Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 15:24:24 -0500 Subject: [PATCH 03/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 626bedbe..6beebb03 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,8 +69,8 @@ jobs: strategy: maxParallel: 2 matrix: - x64: - buildArch: x64 + amd64: + buildArch: arm64 pool: M1 Mac steps: From 5a4017ac55a2acbae0b1717361d59d5ba941c95f Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 15:30:13 -0500 Subject: [PATCH 04/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6beebb03..39266a5e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -74,10 +74,10 @@ jobs: pool: M1 Mac steps: - - task: UsePythonVersion@0 - inputs: - versionSpec: $(python.version) - architecture: $(buildArch) + # - task: UsePythonVersion@0 + # inputs: + # versionSpec: $(python.version) + # architecture: $(buildArch) - bash: scripts/build.sh displayName: Build - task: PublishPipelineArtifact@0 From bbb8445a3a88f96d58cf5d330ac17287d11d296d Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 15:49:10 -0500 Subject: [PATCH 05/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 39266a5e..6beebb03 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -74,10 +74,10 @@ jobs: pool: M1 Mac steps: - # - task: UsePythonVersion@0 - # inputs: - # versionSpec: $(python.version) - # architecture: $(buildArch) + - task: UsePythonVersion@0 + inputs: + versionSpec: $(python.version) + architecture: $(buildArch) - bash: scripts/build.sh displayName: Build - task: PublishPipelineArtifact@0 From aa4a2d5b8a883df242328b93529973f4083cad27 Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 15:50:55 -0500 Subject: [PATCH 06/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6beebb03..7e810912 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - python.version: '3.9.x' + python.version: '3.8.x' jobs: - job: UpdateBuildNumber From e7c3d9bc8ec0e6277a74e302347f8c57bf899c8a Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 15:53:34 -0500 Subject: [PATCH 07/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7e810912..6beebb03 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - python.version: '3.8.x' + python.version: '3.9.x' jobs: - job: UpdateBuildNumber From 2ef8595cab613e56e80e329f707dde7db65dd5ce Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 15:54:09 -0500 Subject: [PATCH 08/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6beebb03..edcaf60b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,7 +69,7 @@ jobs: strategy: maxParallel: 2 matrix: - amd64: + arm64: buildArch: arm64 pool: M1 Mac From 45d4513a73a395a77ea177e583ce09470ddceb56 Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 16:00:23 -0500 Subject: [PATCH 09/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index edcaf60b..5c211d85 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - python.version: '3.9.x' + python.version: '3.8.x' jobs: - job: UpdateBuildNumber From 01e40ec93b7463a47a8c8395c20a89aabf336172 Mon Sep 17 00:00:00 2001 From: Kunwar Sahni Date: Fri, 31 Dec 2021 16:25:20 -0500 Subject: [PATCH 10/10] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5c211d85..edcaf60b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - python.version: '3.8.x' + python.version: '3.9.x' jobs: - job: UpdateBuildNumber