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

Optimise executors when shorted (#1301)

Browse source 
* Optimise executors when shorted

* Test short

* Also handle mac

* Test short
This commit is contained in:
Rahuλ Dé 2022-06-21 14:32:23 +01:00 committed by GitHub
parent b5dea3563d
commit 512dbf9ea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 102 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.circleci/script/short_ci.clj
View file

@ -21,12 +21,21 @@
[(run "Shorted" "echo 'Skipping Run'")] [(run "Shorted" "echo 'Skipping Run'")]
steps)) steps))
(defn gen-job
[shorted? conf]
(if shorted?
(-> conf
(dissoc :machine :macos)
(assoc :resource_class "small" :docker [{:image "ubuntu:latest"}]))
conf))
(defn pull-submodules (defn pull-submodules
[] []
(run "Pull Submodules" "git submodule init\ngit submodule update")) (run "Pull Submodules" "git submodule init\ngit submodule update"))
(defn deploy (defn deploy
[shorted?] [shorted?]
(gen-job shorted?
(ordered-map (ordered-map
:resource_class "large" :resource_class "large"
:docker [{:image "circleci/clojure:lein-2.9.8"}] :docker [{:image "circleci/clojure:lein-2.9.8"}]
@ -40,10 +49,12 @@
"v1-dependencies-"]}} "v1-dependencies-"]}}
{:run ".circleci/script/deploy"} {:run ".circleci/script/deploy"}
{:save_cache {:paths ["~/.m2"] {:save_cache {:paths ["~/.m2"]
:key "v1-dependencies-{{ checksum \"project.clj\" }}"}}]))) :key "v1-dependencies-{{ checksum \"project.clj\" }}"}}]))))
(defn docker (defn docker
[shorted?] [shorted?]
(gen-job
shorted?
(ordered-map (ordered-map
:machine {:image "ubuntu-2004:202111-01"} :machine {:image "ubuntu-2004:202111-01"}
:steps :steps
@ -58,10 +69,12 @@
{:name "Build Docker image" {:name "Build Docker image"
:environment {:PLATFORMS "linux/amd64,linux/arm64"} :environment {:PLATFORMS "linux/amd64,linux/arm64"}
:command :command
"java -jar ./target/babashka-$(cat resources/BABASHKA_VERSION)-standalone.jar .circleci/script/docker.clj"}}]))) "java -jar ./target/babashka-$(cat resources/BABASHKA_VERSION)-standalone.jar .circleci/script/docker.clj"}}]))))
(defn jvm (defn jvm
[shorted?] [shorted?]
(gen-job
shorted?
(ordered-map (ordered-map
:docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}] :docker [{:image "circleci/clojure:openjdk-11-lein-2.9.8-bullseye"}]
:working_directory "~/repo" :working_directory "~/repo"
@ -96,7 +109,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
{:store_artifacts {:path "/tmp/release" {:store_artifacts {:path "/tmp/release"
:destination "release"}} :destination "release"}}
{:save_cache {:paths ["~/.m2"] {:save_cache {:paths ["~/.m2"]
:key "v1-dependencies-{{ checksum \"project.clj\" }}-{{ checksum \"deps.edn\" }}"}}]))) :key "v1-dependencies-{{ checksum \"project.clj\" }}-{{ checksum \"deps.edn\" }}"}}]))))
(defn unix (defn unix
[shorted? static? musl? arch executor-conf resource-class graalvm-home platform] [shorted? static? musl? arch executor-conf resource-class graalvm-home platform]
@ -126,6 +139,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
(if (= "aarch64" arch) (if (= "aarch64" arch)
"aarch64-" "aarch64-"
""))] ""))]
(gen-job shorted?
(merge (merge
executor-conf executor-conf
(ordered-map (ordered-map
@ -159,7 +173,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
{:store_artifacts {:path "/tmp/release" {:store_artifacts {:path "/tmp/release"
:destination "release"}} :destination "release"}}
(run "Publish artifact link to Slack" (run "Publish artifact link to Slack"
"./bb .circleci/script/publish_artifact.clj || true")])))))) "./bb .circleci/script/publish_artifact.clj || true")])))))))
(defn make-config (defn make-config
[shorted?] [shorted?]