From c80bc1731395f39bfa1612ae9bb4b2e0294610ef Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 27 Dec 2019 00:52:32 +0100 Subject: [PATCH 1/6] debug --- src/borkdude/deps.clj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/borkdude/deps.clj b/src/borkdude/deps.clj index 6f79aab..856c4e6 100755 --- a/src/borkdude/deps.clj +++ b/src/borkdude/deps.clj @@ -253,6 +253,8 @@ function Get-StringHash($str) { (binding [*out* *err*] (println "Could not find clojure tools jar. Consider setting CLOJURE_TOOLS_CP.") (System/exit 1))) + _ (prn "INSTALL DIR" install-dir) + _ (prn "TOOLS_CP" tools-cp) deps-edn (or (:deps-file args) "deps.edn")] From 24cb601f018682c2208396731dfad7e48701278a Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 27 Dec 2019 00:53:21 +0100 Subject: [PATCH 2/6] debug --- script/compile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/compile b/script/compile index 8e5edf2..e1d18b7 100755 --- a/script/compile +++ b/script/compile @@ -17,6 +17,8 @@ fi DEPS_CLJ_VERSION=$(cat resources/DEPS_CLJ_VERSION) +lein deps.clj -Spath -Sdeps '{:deps {borkdude/deps.clj {:mvn/version "0.0.1"}}}' + lein do clean, uberjar $NATIVE_IMAGE \ From 01d4257552efcc00f75fe6d57df1ef74d83c56f4 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 27 Dec 2019 00:56:00 +0100 Subject: [PATCH 3/6] fix install clojure --- .circleci/script/install-clojure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/script/install-clojure b/.circleci/script/install-clojure index b4cb4a5..ff4dcc7 100755 --- a/.circleci/script/install-clojure +++ b/.circleci/script/install-clojure @@ -3,8 +3,8 @@ install_dir=${1:-/tmp/clojure} mkdir -p "$install_dir" cd /tmp -curl -O -sL https://download.clojure.org/install/clojure-tools-1.10.1.447.tar.gz -tar xzf clojure-tools-1.10.1.447.tar.gz +curl -O -sL https://download.clojure.org/install/clojure-tools-1.10.1.492.tar.gz +tar xzf clojure-tools-1.10.1.492.tar.gz cd clojure-tools clojure_lib_dir="$install_dir/lib/clojure" mkdir -p "$clojure_lib_dir/libexec" @@ -18,6 +18,6 @@ cp clojure "$install_dir/bin" cp clj "$install_dir/bin" cd /tmp -rm -rf clojure-tools-1.10.1.447.tar.gz +rm -rf clojure-tools-1.10.1.492.tar.gz rm -rf clojure-tools echo "Installed clojure to $install_dir/bin" From 1ac50d90555261ee196f7e899cd13a12a53b628a Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 27 Dec 2019 00:59:05 +0100 Subject: [PATCH 4/6] Install clojure --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c813e30..93de550 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,9 +21,9 @@ jobs: - run: name: Install Clojure command: | - wget -nc https://download.clojure.org/install/linux-install-1.10.1.447.sh - chmod +x linux-install-1.10.1.447.sh - sudo ./linux-install-1.10.1.447.sh + wget -nc https://download.clojure.org/install/linux-install-1.10.1.492.sh + chmod +x linux-install-1.10.1.492.sh + sudo ./linux-install-1.10.1.492.sh # - run: # name: Run JVM tests # command: | @@ -67,9 +67,9 @@ jobs: - run: name: Install Clojure command: | - wget https://download.clojure.org/install/linux-install-1.10.1.447.sh - chmod +x linux-install-1.10.1.447.sh - sudo ./linux-install-1.10.1.447.sh + wget https://download.clojure.org/install/linux-install-1.10.1.492.sh + chmod +x linux-install-1.10.1.492.sh + sudo ./linux-install-1.10.1.492.sh - run: name: Install lsof command: | From fbbe6177a99bf185fce7731ab3a32d6c59ca65d3 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 27 Dec 2019 00:59:48 +0100 Subject: [PATCH 5/6] Remove debug --- src/borkdude/deps.clj | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/borkdude/deps.clj b/src/borkdude/deps.clj index 856c4e6..6f79aab 100755 --- a/src/borkdude/deps.clj +++ b/src/borkdude/deps.clj @@ -253,8 +253,6 @@ function Get-StringHash($str) { (binding [*out* *err*] (println "Could not find clojure tools jar. Consider setting CLOJURE_TOOLS_CP.") (System/exit 1))) - _ (prn "INSTALL DIR" install-dir) - _ (prn "TOOLS_CP" tools-cp) deps-edn (or (:deps-file args) "deps.edn")] From b961e167abd34a401c982b80a6c3a0c7930c1b95 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 27 Dec 2019 01:00:09 +0100 Subject: [PATCH 6/6] v0.0.2 --- resources/DEPS_CLJ_VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/DEPS_CLJ_VERSION b/resources/DEPS_CLJ_VERSION index 70d4370..7bcd0e3 100644 --- a/resources/DEPS_CLJ_VERSION +++ b/resources/DEPS_CLJ_VERSION @@ -1 +1 @@ -0.0.2-SNAPSHOT \ No newline at end of file +0.0.2 \ No newline at end of file