From ac3aa69570b2c71c05fa8fb6ba1335ab7a1e46d4 Mon Sep 17 00:00:00 2001
From: Pawel Lipski <pawel.p.lipski@gmail.com>
Date: Thu, 10 Oct 2024 10:31:22 +0200
Subject: [PATCH] Revert macOS job in CI

---
 .circleci/config.yml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ac2cc82c..4212456fe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,13 @@
 version: 2.1
 
 executors:
+  macos_executor:
+    macos:
+      # https://circleci.com/docs/using-macos/#supported-xcode-versions
+      xcode: 16.1.0
+    # https://circleci.com/docs/using-macos/#available-resource-classes
+    # https://circleci.com/pricing/#comparison-table
+    resource_class: macos.m1.medium.gen1
   ubuntu_executor:
     machine:
       # https://circleci.com/developer/images?imageType=machine
@@ -177,13 +184,25 @@ jobs:
           root: .
           paths: [ .coverage.* ]
 
-  # As of July 2024, there's no free macOS machine available on CircleCI :/
-  # See https://discuss.circleci.com/t/macos-intel-support-deprecation-in-january-2024/48718
-
   # Note the while we use Linux executor to test against specific Python&git version,
-  # on Windows we're just checking compatibility with the OS itself,
+  # on macOS and Windows we're just checking compatibility with the OS itself,
   # relying on whatever recent versions of Python and git are provided in the image.
 
+  "macos tests":
+    executor: macos_executor
+    steps:
+      - checkout
+      - run: brew install fish zsh
+      - run: pip install tox
+      # TODO (#1005): make zsh completion tests pass on macOS machine on CI
+      - run: tox -e test-completions -- -vv -k "not zsh"
+      - run: PYTHON_VERSION=3-macos  tox -e coverage -- -vv
+      - store_test_results:
+          path: test-results/
+      - persist_to_workspace:
+          root: .
+          paths: [ .coverage.* ]
+
   "windows tests":
     executor: windows_executor
     steps:
@@ -286,6 +305,7 @@ test_jobs: &test_jobs
   - python 3_11 git 2_38_1
   - python 3_12 git 2_46_1
   - python 3_13 git 2_47_0
+  - macos tests
   - windows tests
 
 only_master: &only_master
@@ -306,6 +326,7 @@ workflows:
       - python 3_11 git 2_38_1
       - python 3_12 git 2_46_1
       - python 3_13 git 2_47_0
+      - macos tests
       - windows tests
       - coverage upload:
           requires: