Enable local-caching for uberjar builds

DrTom · DrTom · commit e4fe36134aa6 · 2021-09-29T21:54:01.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ madek-media-service_aot.jar
 node_modules/
 pom.xml
 resources/build-timestamp.txt
+resources/commit-id.txt
 resources/media-service/public/js/
 tmp/
 tmux-client*.log
diff --git a/bin/clean b/bin/clean
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euxo
-rm -rf madek-media-service
 rm -rf resources/media-service/public/js/
 rm -f resources/build-timestamp.txt
+rm -f resources/build-timestamp.txt
+rm -f resources/deps.svg
diff --git a/bin/clj-deps-graph b/bin/clj-deps-graph
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 set -euxo
-clj -A:graph --output-format svg "$@"
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
+clojure -A:graph --output-format svg "$@"
diff --git a/bin/clj-outdated-show b/bin/clj-outdated-show
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 set -euxo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 clojure -Aoutdated -a outdated
diff --git a/bin/clj-outdated-update b/bin/clj-outdated-update
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 set -euxo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 clojure -Aoutdated -a outdated --update
 $(dirname "$0")/clj-deps-graph
diff --git a/bin/clj-repl b/bin/clj-repl
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 set -euxo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 rlwrap clj -R:nREPL -m nrepl.cmdline -i "$@"
diff --git a/bin/clj-run b/bin/clj-run
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 set -euo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 clj -m madek.media-service.main "$@"
diff --git a/bin/clj-test b/bin/clj-test
@@ -1,3 +1,6 @@
 #!/usr/bin/env bash
 set -euo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 clj -A:test
diff --git a/bin/clj-uberjar b/bin/clj-uberjar
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 set -euxo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 clojure -Spom
 clojure -A:depstar:resources -m hf.depstar.uberjar madek-media-service.jar -C -m madek.media-service.main
diff --git a/bin/cljs-build-app b/bin/cljs-build-app
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 set -euxo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 rm -rf resources/media-service/public/js/
 npx shadow-cljs compile app
diff --git a/bin/cljs-release-app b/bin/cljs-release-app
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 set -euxo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 rm -rf resources/media-service/public/js/
 npm ci
 npx shadow-cljs release app
diff --git a/bin/cljs-watch-app b/bin/cljs-watch-app
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 set -euxo
+PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
+cd $PROJECT_DIR
+source $PROJECT_DIR/clojure/bin/activate
 rm -rf resources/media-service/public/js/
 npx shadow-cljs watch app
diff --git a/bin/uberjar b/bin/uberjar
@@ -1,17 +1,49 @@
 #!/usr/bin/env bash
-set -euxo
+set -eu
+
+set -x
 
 PROJECT_NAME="madek-media-service"
+JAR_NAME="${PROJECT_NAME}.jar"
 PROJECT_DIR="$(cd -- "$(dirname "${BASH_SOURCE}")" ; cd .. > /dev/null 2>&1 && pwd -P)"
 
-cd $PROJECT_DIR
+# dirty working tree checking is problematic on CI => disabled for now
+# IGNORE_DIRTY_WORKING_DIR="${IGNORE_DIRTY_WORKING_DIR:-NO}"
+# if [ $IGNORE_DIRTY_WORKING_DIR == "NO" ]; then
+#   git diff --quiet
+# fi
+
+DIGEST="$(git -C "$PROJECT_DIR" log -n 1 HEAD --pretty=%T)"
+LOCAL_CACHE_DIR="${LOCAL_CACHE_DIR:-"${TMPDIR:-/tmp/}build-cache"}"
+mkdir -p ${LOCAL_CACHE_DIR}
+LOCAL_CACHED_ARTEFACT_PATH="${LOCAL_CACHE_DIR}/${PROJECT_NAME}_${DIGEST}.jar"
+BUILD_CACHE_DISABLED="${BUILD_CACHE_DISABLED:-NO}"
+
+set +x
 
-# add our clojure version to the path
-source $PROJECT_DIR/clojure/bin/activate
+function build {
+  cd $PROJECT_DIR
+  ./bin/clean
+  rm -f $JAR_NAME
+  COMMIT_ID="$(git log -1 HEAD --pretty=%H)"
+  echo $COMMIT_ID > resources/commit-id.txt
+  echo $(date -u +"%Y-%m-%dT%H:%M:%SZ") > resources/build-timestamp.txt
+  source $PROJECT_DIR/clojure/bin/activate
+  ./bin/clj-deps-graph
+  cp deps.svg resources/
+  ./bin/cljs-release-app
+  ./bin/clj-uberjar
+  ./bin/clean
+}
 
-rm -f madek-media-service.jar
-./bin/clean
-echo $(date -u +"%Y-%m-%dT%H:%M:%SZ") > resources/build-timestamp.txt
-./bin/cljs-release-app
-./bin/clj-uberjar
-./bin/clean
+if [ $BUILD_CACHE_DISABLED == "YES" ]; then
+  build
+else
+  if [ -e $LOCAL_CACHED_ARTEFACT_PATH ]; then
+    echo "INFO: locally cached jar found"
+    cp $LOCAL_CACHED_ARTEFACT_PATH $PROJECT_DIR/$JAR_NAME
+  else
+    build
+    cp $PROJECT_DIR/$JAR_NAME $LOCAL_CACHED_ARTEFACT_PATH
+  fi
+fi
diff --git a/deps.svg b/deps.svg
