From 693807e4b576b235af03b0c306141dd7574bc0b9 Mon Sep 17 00:00:00 2001
From: John Lee <john.lee@algorand.com>
Date: Thu, 20 Jun 2024 09:47:50 -0400
Subject: [PATCH 1/2] Remove Mac AMD64 support from CircleCI.

---
 .circleci/config.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8208fe063b..a625823b07 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,19 +45,6 @@ executors:
     machine:
       image: << pipeline.parameters.ubuntu_image >>
     resource_class: arm.large
-  mac_amd64_medium:
-    macos:
-      xcode: 14.2.0
-    resource_class: macos.x86.medium.gen2
-    environment:
-      HOMEBREW_NO_AUTO_UPDATE: "true"
-  mac_amd64_large:
-    macos:
-      xcode: 14.2.0
-    # Since they removed the large class for amd64, we will use medium here too.
-    resource_class: macos.x86.medium.gen2
-    environment:
-      HOMEBREW_NO_AUTO_UPDATE: "true"
   mac_arm64: &executor-mac-arm64
     machine: true
     resource_class: algorand/macstadium-m1
@@ -86,7 +73,7 @@ workflows:
           name: << matrix.platform >>_build_nightly
           matrix: &matrix-nightly
             parameters:
-              platform: ["amd64", "arm64", "mac_amd64", "mac_arm64"]
+              platform: ["amd64", "arm64", "mac_arm64"]
           filters: &filters-nightly
             branches:
               only:
@@ -137,7 +124,7 @@ workflows:
           name: << matrix.platform >>_<< matrix.job_type >>_verification
           matrix:
             parameters:
-              platform: ["amd64", "arm64", "mac_amd64", "mac_arm64"]
+              platform: ["amd64", "arm64", "mac_arm64"]
               job_type: ["test_nightly", "integration_nightly", "e2e_expect_nightly"]
           requires:
             - << matrix.platform >>_<< matrix.job_type >>

From be4f12239ff30535673188fb646730b186c1a4cf Mon Sep 17 00:00:00 2001
From: John Lee <john.lee@algorand.com>
Date: Fri, 21 Jun 2024 10:48:24 -0400
Subject: [PATCH 2/2] Switch to CircleCI's mac runners

---
 .circleci/config.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a625823b07..f431e91160 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,17 +45,18 @@ executors:
     machine:
       image: << pipeline.parameters.ubuntu_image >>
     resource_class: arm.large
-  mac_arm64: &executor-mac-arm64
-    machine: true
-    resource_class: algorand/macstadium-m1
+  mac_arm64_medium:
+    macos:
+      xcode: 14.2.0
+    resource_class: macos.m1.medium.gen1
     environment:
       HOMEBREW_NO_AUTO_UPDATE: "true"
-  # these are required b/c jobs explicitly assign sizes to the executors
-  # for `mac_arm64` there is only one size
-  mac_arm64_medium:
-    <<: *executor-mac-arm64
   mac_arm64_large:
-    <<: *executor-mac-arm64
+    macos:
+      xcode: 14.2.0
+    resource_class: macos.m1.large.gen1
+    environment:
+      HOMEBREW_NO_AUTO_UPDATE: "true"
 
 slack-fail-stop-step: &slack-fail-post-step
   post-steps: