luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #1598: use Rosetta on CircleCI to build x64 images (#1708)

Browse source
This commit is contained in:
Michiel Borkent 2024-06-30 09:28:56 +02:00 committed by GitHub
parent 2da875c8f9
commit 83918c4b80
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.circleci/script/gen_ci.clj
View file

@ -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") (run "Pull Submodules" "git submodule init\ngit submodule update")
{:restore_cache {:restore_cache
{:keys [cache-key]}} {: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") (run "Install Clojure" "sudo script/install-clojure")
(when (= "mac" platform) (when (= "mac" platform)
(run "Install Leiningen" "script/install-leiningen")) (run "Install Leiningen" "script/install-leiningen"))
@ -192,7 +194,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
[shorted?] [shorted?]
(let [docker-executor-conf {:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]} (let [docker-executor-conf {:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]}
machine-executor-conf {:machine {:image "ubuntu-2004:202111-01"}} 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) linux-graalvm-home (str "/home/circleci/graalvm-" graalvm-version)
mac-graalvm-home (format "/Users/distiller/graalvm-%s/Contents/Home" graalvm-version)] mac-graalvm-home (format "/Users/distiller/graalvm-%s/Contents/Home" graalvm-version)]
(ordered-map (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") (unix shorted? true true "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
:linux-aarch64-static :linux-aarch64-static
(unix shorted? true false "aarch64" machine-executor-conf "arm.large" linux-graalvm-home "linux") (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?) :deploy (deploy shorted?)
:docker (docker shorted?)) :docker (docker shorted?))
:workflows (ordered-map :workflows (ordered-map