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

Pass correct arch (#1300)

Browse source 
* [wip] pass correct arch

* [wip] pass arch only when aarch64

* [skip ci] add branch filter back to docker
This commit is contained in:
Rahuλ Dé 2022-06-20 21:20:50 +01:00 committed by GitHub
parent 381b9f0a4f
commit b5dea3563d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.circleci/script/short_ci.clj
View file

@ -107,8 +107,10 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
"macos" "macos"
platform) platform)
:BABASHKA_TEST_ENV "native" :BABASHKA_TEST_ENV "native"
:BABASHKA_ARCH arch
:BABASHKA_XMX "-J-Xmx6500m"} :BABASHKA_XMX "-J-Xmx6500m"}
env (if (= "aarch64" arch)
(assoc env :BABASHKA_ARCH arch)
env)
env (if static? env (if static?
(assoc env :BABASHKA_STATIC "true") (assoc env :BABASHKA_STATIC "true")
env) env)
@ -177,9 +179,9 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
"docker run --privileged --rm tonistiigi/binfmt --install all\ndocker buildx create --name ci-builder --use"}}]}} "docker run --privileged --rm tonistiigi/binfmt --install all\ndocker buildx create --name ci-builder --use"}}]}}
:jobs (ordered-map :jobs (ordered-map
:jvm (jvm shorted?) :jvm (jvm shorted?)
:linux (unix shorted? false false "x86_64" docker-executor-conf "large" linux-graalvm-home "linux") :linux (unix shorted? false false "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
:linux-static :linux-static
(unix shorted? true true "x86_64" docker-executor-conf "large" linux-graalvm-home "linux") (unix shorted? true true "amd64" docker-executor-conf "large" linux-graalvm-home "linux")
:linux-aarch64 (unix shorted? :linux-aarch64 (unix shorted?
false false
false false
@ -190,7 +192,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
"linux") "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 "x86_64" mac-executor-conf "large" mac-graalvm-home "mac") :mac (unix shorted? false false "amd64" mac-executor-conf "large" mac-graalvm-home "mac")
:deploy (deploy shorted?) :deploy (deploy shorted?)
:docker (docker shorted?)) :docker (docker shorted?))
:workflows (ordered-map :workflows (ordered-map