From 83918c4b804dc1e5c101503acabf1e5fa358c473 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Sun, 30 Jun 2024 09:28:56 +0200
Subject: [PATCH] Fix #1598: use Rosetta on CircleCI to build x64 images
 (#1708)

---
 .circleci/script/gen_ci.clj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/script/gen_ci.clj b/.circleci/script/gen_ci.clj
index 7fadc293..2ba49748 100644
--- a/.circleci/script/gen_ci.clj
+++ b/.circleci/script/gen_ci.clj
@@ -163,6 +163,8 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
                                             (run "Pull Submodules" "git submodule init\ngit submodule update")
                                             {:restore_cache
                                              {:keys [cache-key]}}
+                                            (when (= "mac" platform)
+                                              (run "Install Rosetta" "sudo /usr/sbin/softwareupdate --install-rosetta --agree-to-license"))
                                             (run "Install Clojure" "sudo script/install-clojure")
                                             (when (= "mac" platform)
                                               (run "Install Leiningen" "script/install-leiningen"))
@@ -192,7 +194,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
   [shorted?]
   (let [docker-executor-conf  {:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]}
         machine-executor-conf {:machine {:image "ubuntu-2004:202111-01"}}
-        mac-executor-conf     {:macos {:xcode "12.5.1"}}
+        mac-executor-conf     {:macos {:xcode "13.4.1"}}
         linux-graalvm-home    (str "/home/circleci/graalvm-" graalvm-version)
         mac-graalvm-home      (format "/Users/distiller/graalvm-%s/Contents/Home" graalvm-version)]
     (ordered-map
@@ -211,7 +213,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
                    (unix shorted? true true "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
                    :linux-aarch64-static
                    (unix shorted? true false "aarch64" machine-executor-conf "arm.large" linux-graalvm-home "linux")
-                   :mac (unix shorted? false false "amd64" mac-executor-conf "macos.x86.medium.gen2" mac-graalvm-home "mac")
+                   :mac (unix shorted? false false "amd64" mac-executor-conf "macos.m1.medium.gen1" mac-graalvm-home "mac")
                    :deploy (deploy shorted?)
                    :docker (docker shorted?))
       :workflows (ordered-map