From 497e2e6986456416a6b7a446d3bd30674ce550ad Mon Sep 17 00:00:00 2001
From: sobolevn <mail@sobolevn.me>
Date: Thu, 14 Sep 2023 13:36:33 +0300
Subject: [PATCH 1/2] gh-109395: Remove macOS builds from Azure Pipelines

---
 .azure-pipelines/ci.yml          | 18 ------------------
 .azure-pipelines/macos-steps.yml | 27 ---------------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 .azure-pipelines/macos-steps.yml

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 63252a76abb69f..25c972334ec614 100644
--- a/.azure-pipelines/ci.yml
+++ b/.azure-pipelines/ci.yml
@@ -14,24 +14,6 @@ jobs:
   - template: ./prebuild-checks.yml
 
 
-- job: macOS_CI_Tests
-  displayName: macOS CI Tests
-  dependsOn: Prebuild
-  #condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
-  # bpo-39837: macOS tests on Azure Pipelines are disabled
-  condition: false
-
-  variables:
-    testRunTitle: '$(build.sourceBranchName)-macos'
-    testRunPlatform: macos
-
-  pool:
-    vmImage: macos-10.15
-
-  steps:
-  - template: ./macos-steps.yml
-
-
 - job: Ubuntu_CI_Tests
   displayName: Ubuntu CI Tests
   dependsOn: Prebuild
diff --git a/.azure-pipelines/macos-steps.yml b/.azure-pipelines/macos-steps.yml
deleted file mode 100644
index fa38a0df8c87b8..00000000000000
--- a/.azure-pipelines/macos-steps.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-steps:
-- checkout: self
-  clean: true
-  fetchDepth: 5
-
-- script: ./configure --with-pydebug --with-openssl=/usr/local/opt/openssl --prefix=/opt/python-azdev
-  displayName: 'Configure CPython (debug)'
-
-- script: make -j4
-  displayName: 'Build CPython'
-
-- script: make pythoninfo
-  displayName: 'Display build info'
-
-- script: make buildbottest TESTOPTS="-j4 -uall,-cpu --junit-xml=$(build.binariesDirectory)/test-results.xml"
-  displayName: 'Tests'
-  continueOnError: true
-  timeoutInMinutes: 30
-
-- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFiles: '$(build.binariesDirectory)/test-results.xml'
-    mergeTestResults: true
-    testRunTitle: $(testRunTitle)
-    platform: $(testRunPlatform)
-  condition: succeededOrFailed()

From a36bc25d316c8544b8b907f5a3269c845194c82d Mon Sep 17 00:00:00 2001
From: sobolevn <mail@sobolevn.me>
Date: Thu, 14 Sep 2023 13:38:49 +0300
Subject: [PATCH 2/2] And from `pr.yaml`

---
 .azure-pipelines/pr.yml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml
index 939c9b4249a3c2..50ca80a7b71b6f 100644
--- a/.azure-pipelines/pr.yml
+++ b/.azure-pipelines/pr.yml
@@ -14,26 +14,6 @@ jobs:
   - template: ./prebuild-checks.yml
 
 
-- job: macOS_PR_Tests
-  displayName: macOS PR Tests
-  dependsOn: Prebuild
-  #condition: and(succeeded(), eq(dependencies.Prebuild.outputs['tests.run'], 'true'))
-  # bpo-39837: macOS tests on Azure Pipelines are disabled
-  condition: false
-
-  variables:
-    testRunTitle: '$(system.pullRequest.TargetBranch)-macos'
-    testRunPlatform: macos
-
-  pool:
-    vmImage: macos-10.15
-
-  steps:
-  - template: ./macos-steps.yml
-    parameters:
-      targetBranch: $(System.PullRequest.TargetBranch)
-
-
 - job: Ubuntu_PR_Tests
   displayName: Ubuntu PR Tests
   dependsOn: Prebuild