From 780a6a3f516c7173a84acce372bb3bb17f302005 Mon Sep 17 00:00:00 2001 From: Tamas Herman Date: Mon, 5 Dec 2022 06:57:04 +0800 Subject: [PATCH 01/12] Apple M1 compatibility --- CHANGELOG.md | 14 +++++++++++--- deps.edn | 16 ++++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f6c988..07cdfc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,18 +3,26 @@ ## [master](https://github.com/dundalek/closh/compare/v0.5.0...master) (unreleased) ### New features + +- Upgrade org.xerial/sqlite-jdbc to 3.40.0.0, which provides Apple M1 compatibility + ### Fixes + ### Other changes -## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) +- Upgrade org.clojure/java.jdbc to 0.7.12 +- Upgrade org.clojure/data.json to 2.4.0, because it's a lot faster +## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) ### New features - JVM version: Improved history storage in (stores it in sqlite db same as the lumo version) -- JVM version: Implemented alias expansion by [@djblue](https://github.com/djblue) ([#150](https://github.com/dundalek/closh/pull/150)) +- JVM version: Implemented alias expansion + by [@djblue](https://github.com/djblue) ([#150](https://github.com/dundalek/closh/pull/150)) - JVM version: Make abbreviations work (by treating them as same as aliases for now) -- Add support for `cd -` go to previous directory by [@kirillsalykin](https://github.com/kirillsalykin) ([#167](https://github.com/dundalek/closh/pull/167)) +- Add support for `cd -` go to previous directory + by [@kirillsalykin](https://github.com/kirillsalykin) ([#167](https://github.com/dundalek/closh/pull/167)) ### Fixes diff --git a/deps.edn b/deps.edn index f647e72..544c374 100644 --- a/deps.edn +++ b/deps.edn @@ -1,12 +1,12 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.2-alpha2"} - org.clojure/tools.reader {:mvn/version "1.3.2"} - org.clojure/data.json {:mvn/version "0.2.6"} - com.cemerick/pomegranate {:mvn/version "1.1.0"} - org.clojure/tools.cli {:mvn/version "0.4.1"} - org.clojure/java.jdbc {:mvn/version "0.7.9"} - org.xerial/sqlite-jdbc {:mvn/version "3.27.2.1"} - squarepeg/squarepeg {:mvn/version "0.6.1"} + {org.clojure/clojure {:mvn/version "1.10.2-alpha2"} + org.clojure/tools.reader {:mvn/version "1.3.2"} + org.clojure/data.json {:mvn/version "2.4.0"} + com.cemerick/pomegranate {:mvn/version "1.1.0"} + org.clojure/tools.cli {:mvn/version "0.4.1"} + org.clojure/java.jdbc {:mvn/version "0.7.12"} + org.xerial/sqlite-jdbc {:mvn/version "3.40.0.0"} + squarepeg/squarepeg {:mvn/version "0.6.1"} com.bhauman/rebel-readline {:mvn/version "0.1.4" :exclusions [rewrite-cljs/rewrite-cljs]}} From f0c04403cd18cd60a266b948153bf5e309535f47 Mon Sep 17 00:00:00 2001 From: Tamas Herman Date: Mon, 5 Dec 2022 07:32:35 +0800 Subject: [PATCH 02/12] Upgrade cljfmt to 0.9.0 --- CHANGELOG.md | 1 + deps.edn | 8 ++++---- src/jvm/closh/zero/utils/clojure_main.clj | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07cdfc4..b7dd829 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Upgrade org.clojure/java.jdbc to 0.7.12 - Upgrade org.clojure/data.json to 2.4.0, because it's a lot faster +- Upgrade cljfmt to 0.9.0 ## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) diff --git a/deps.edn b/deps.edn index 544c374..82ac221 100644 --- a/deps.edn +++ b/deps.edn @@ -30,11 +30,11 @@ :deps/root "rebel-readline" :exclusions [rewrite-cljs/rewrite-cljs]}}} - :lint {:extra-deps {cljfmt/cljfmt {:mvn/version "0.7.0"}} - :main-opts ["-m" "cljfmt.main" "--file-pattern" "(? Date: Mon, 5 Dec 2022 07:55:28 +0800 Subject: [PATCH 03/12] Upgrade Clojure to 1.11.1 --- CHANGELOG.md | 3 +++ deps.edn | 8 ++++---- test/closh/scripting_test.cljc | 37 ++++++++++++++++++---------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7dd829..c16c877 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ - Upgrade org.clojure/java.jdbc to 0.7.12 - Upgrade org.clojure/data.json to 2.4.0, because it's a lot faster - Upgrade cljfmt to 0.9.0 +- Upgrade Clojure to 1.11.1 +- Upgrade org.clojure/tools.cli to 1.0.214 +- Upgrade org.clojure/tools.reader to 1.3.6 ## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) diff --git a/deps.edn b/deps.edn index 82ac221..9c5f75f 100644 --- a/deps.edn +++ b/deps.edn @@ -1,14 +1,14 @@ {:deps - {org.clojure/clojure {:mvn/version "1.10.2-alpha2"} - org.clojure/tools.reader {:mvn/version "1.3.2"} + {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/tools.reader {:mvn/version "1.3.6"} org.clojure/data.json {:mvn/version "2.4.0"} com.cemerick/pomegranate {:mvn/version "1.1.0"} - org.clojure/tools.cli {:mvn/version "0.4.1"} + org.clojure/tools.cli {:mvn/version "1.0.214"} org.clojure/java.jdbc {:mvn/version "0.7.12"} org.xerial/sqlite-jdbc {:mvn/version "3.40.0.0"} squarepeg/squarepeg {:mvn/version "0.6.1"} com.bhauman/rebel-readline {:mvn/version "0.1.4" - :exclusions [rewrite-cljs/rewrite-cljs]}} + :exclusions [rewrite-cljs/rewrite-cljs]}} :paths ["src/common" "src/jvm" "resources"] diff --git a/test/closh/scripting_test.cljc b/test/closh/scripting_test.cljc index d52ab84..22b50d7 100644 --- a/test/closh/scripting_test.cljc +++ b/test/closh/scripting_test.cljc @@ -3,21 +3,22 @@ [closh.zero.core :refer [shx]] [closh.zero.pipeline :refer [process-output process-value pipe]])) -(def sci? #?(:clj (System/getenv "__CLOSH_USE_SCI_EVAL__") +(def sci? #?(:clj (System/getenv "__CLOSH_USE_SCI_EVAL__") :cljs false)) -(def sci-complete? #?(:clj (System/getenv "__CLOSH_USE_SCI_COMPLETE__") +(def sci-complete? #?(:clj (System/getenv "__CLOSH_USE_SCI_COMPLETE__") :cljs false)) (defn closh [& args] (shx "clojure" (concat (if sci? ["-M:sci" "-m" "closh.zero.frontend.sci"] - ["-m" "closh.zero.frontend.rebel"]) + ["-M" "-m" "closh.zero.frontend.rebel"]) args))) (deftest scripting-test - (are [x y] (= x (process-output y)) + (are [x y] + (= x (process-output y)) "a b\n" (closh "-e" "echo a b") @@ -58,16 +59,17 @@ sci-complete?) (deftest scripting-errors-test - (are [result regex cmd] (= result (->> (:stderr (process-value cmd)) - (re-find regex) - (second))) + (are [result regex cmd] + (= result (->> (:stderr (process-value cmd)) + (re-find regex) + (second))) - "5:3" - #"/throw1\.cljc:(\d+:\d+)" + "5" + #"throw1\.cljc:(\d+)" (closh "fixtures/script-mode-tests/throw1.cljc") - "4:2" - #"Syntax error compiling at \(REPL:(\d+:\d+)\)" + "4" + #"Execution error at user/eval\d+ \(REPL:(\d+)\)" (pipe "\n\n\n (throw (Exception. \"my exception message\"))" (closh "-")) ; TODO @@ -77,14 +79,15 @@ ; #"Syntax error \(ExceptionInfo\) compiling at \(REPL:(\d+:\d+)\)") ; (pipe "\n )" (closh "-")) - "5:1" - #"/throw2\.cljc:(\d+:\d+)" + "2" + #"Execution error at user/eval\d+\$my-throw \(throw2\.cljc:(\d+)\)" (closh "fixtures/script-mode-tests/throw2.cljc") "3" #"Execution error at .* \(REPL:(\d+)\)" - (closh "-e" "\n\n(throw (Exception. \"my exception message\"))")))) + (closh "-e" "\n\n(throw (Exception. \"my exception message\"))") - ; "2" - ; #"Execution error at .* \(REPL:(\d+)\)" - ; (closh "-e" "\n )"))) + ; "2" + ; #"Execution error at .* \(REPL:(\d+)\)" + ; (closh "-e" "\n )") + ))) From 316537b58f528e4ac6ddff881309ae4b36aa1384 Mon Sep 17 00:00:00 2001 From: Tamas Herman Date: Mon, 5 Dec 2022 08:08:08 +0800 Subject: [PATCH 04/12] Upgrade SCI to 0.5.36 --- CHANGELOG.md | 1 + deps.edn | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c16c877..ef329c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Upgrade Clojure to 1.11.1 - Upgrade org.clojure/tools.cli to 1.0.214 - Upgrade org.clojure/tools.reader to 1.3.6 +- Upgrade SCI to 0.5.36, addressing https://github.com/dundalek/closh/issues/184 ## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) diff --git a/deps.edn b/deps.edn index 9c5f75f..1bf8044 100644 --- a/deps.edn +++ b/deps.edn @@ -20,15 +20,15 @@ :depstar {:extra-deps {seancorfield/depstar {:mvn/version "1.1.117"}}} - :sci {:extra-paths ["src/closh-sci" "classes"] - :extra-deps {fipp/fipp {:mvn/version "0.6.22"} - borkdude/sci {:mvn/version "0.1.0"} - borkdude/edamame {:mvn/version "0.0.10"} - com.bhauman/rebel-readline - {:git/url "https://github.com/dundalek/rebel-readline.git" - :sha "123be27a75de902233356e11ac66ac53cc5edc08" - :deps/root "rebel-readline" - :exclusions [rewrite-cljs/rewrite-cljs]}}} + :sci {:extra-paths ["src/closh-sci" "classes"] + :extra-deps {fipp/fipp {:mvn/version "0.6.26"} + org.babashka/sci {:mvn/version "0.5.36"} + borkdude/edamame {:mvn/version "1.0.16"} + com.bhauman/rebel-readline + {:git/url "https://github.com/dundalek/rebel-readline.git" + :sha "123be27a75de902233356e11ac66ac53cc5edc08" + :deps/root "rebel-readline" + :exclusions [rewrite-cljs/rewrite-cljs]}}} :lint {:extra-deps {cljfmt/cljfmt {:mvn/version "0.9.0"}} :main-opts ["-m" "cljfmt.main" "--file-pattern" "(? Date: Mon, 5 Dec 2022 08:23:51 +0800 Subject: [PATCH 05/12] Upgrade Cognitect test runner --- CHANGELOG.md | 1 + README.md | 8 ++++++++ deps.edn | 11 +++++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef329c4..d02cddc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - Upgrade org.clojure/tools.cli to 1.0.214 - Upgrade org.clojure/tools.reader to 1.3.6 - Upgrade SCI to 0.5.36, addressing https://github.com/dundalek/closh/issues/184 +- Upgrade Cognitect test runner to v0.5.1 git tag ## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) diff --git a/README.md b/README.md index f102061..3bf154e 100644 --- a/README.md +++ b/README.md @@ -204,15 +204,23 @@ clojure -m closh.zero.frontend.rebel ``` Run tests once + ``` npm run test ``` Re-run tests on change + ``` npm run test-auto ``` +Run tests via [Cognitect test runner](https://github.com/cognitect-labs/test-runner) + +```shell +clojure -X:test:run/test +``` + ### Manual Java builds Run `npm run pkg-java`. The resulting binary will be in `target/closh-zero.jar`. diff --git a/deps.edn b/deps.edn index 1bf8044..fcfe821 100644 --- a/deps.edn +++ b/deps.edn @@ -13,10 +13,13 @@ :paths ["src/common" "src/jvm" "resources"] :aliases - {:test {:extra-paths ["test"] - :extra-deps {com.cognitect/test-runner - {:git/url "https://github.com/cognitect-labs/test-runner.git" - :sha "cb96e80f6f3d3b307c59cbeb49bb0dcb3a2a780b"}}} + {:test {:extra-paths ["test"] + :extra-deps {io.github.cognitect-labs/test-runner + {:git/tag "v0.5.1" :git/sha "dfb30dd"}}} + + :run/test {:main-opts ["-m" "cognitect.test-runner"] + :exec-fn cognitect.test-runner.api/test + :homepage "https://github.com/cognitect-labs/test-runner"} :depstar {:extra-deps {seancorfield/depstar {:mvn/version "1.1.117"}}} From 008330b67a1b60427abb0036a622e70ca5e4ce16 Mon Sep 17 00:00:00 2001 From: Tamas Herman Date: Mon, 5 Dec 2022 08:31:30 +0800 Subject: [PATCH 06/12] Upgrade kaocha to 1.71.1119 --- CHANGELOG.md | 1 + README.md | 6 ++++++ deps.edn | 12 +++++++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d02cddc..571b6b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Upgrade org.clojure/tools.reader to 1.3.6 - Upgrade SCI to 0.5.36, addressing https://github.com/dundalek/closh/issues/184 - Upgrade Cognitect test runner to v0.5.1 git tag +- Upgrade kaocha to 1.71.1119 ## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) diff --git a/README.md b/README.md index 3bf154e..651513d 100644 --- a/README.md +++ b/README.md @@ -221,6 +221,12 @@ Run tests via [Cognitect test runner](https://github.com/cognitect-labs/test-run clojure -X:test:run/test ``` +Run tests via [Kaocha](https://github.com/lambdaisland/kaocha) + +```shell +clojure -X:kaocha:run/kaocha +``` + ### Manual Java builds Run `npm run pkg-java`. The resulting binary will be in `target/closh-zero.jar`. diff --git a/deps.edn b/deps.edn index fcfe821..485ad6f 100644 --- a/deps.edn +++ b/deps.edn @@ -21,7 +21,7 @@ :exec-fn cognitect.test-runner.api/test :homepage "https://github.com/cognitect-labs/test-runner"} - :depstar {:extra-deps {seancorfield/depstar {:mvn/version "1.1.117"}}} + :depstar {:extra-deps {seancorfield/depstar {:mvn/version "1.1.117"}}} :sci {:extra-paths ["src/closh-sci" "classes"] :extra-deps {fipp/fipp {:mvn/version "0.6.26"} @@ -39,5 +39,11 @@ :lint/fix {:extra-deps {cljfmt/cljfmt {:mvn/version "0.9.0"}} :main-opts ["-m" "cljfmt.main" "--file-pattern" "(? Date: Mon, 5 Dec 2022 08:42:27 +0800 Subject: [PATCH 07/12] Upgrade com.cemerick/pomegranate & add changelog links to dep specs to make understanding upgrades more convenient. --- CHANGELOG.md | 1 + deps.edn | 29 +++++++++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 571b6b2..b25c483 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Upgrade SCI to 0.5.36, addressing https://github.com/dundalek/closh/issues/184 - Upgrade Cognitect test runner to v0.5.1 git tag - Upgrade kaocha to 1.71.1119 +- Upgrade com.cemerick/pomegranate to 1.2.1 ## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) diff --git a/deps.edn b/deps.edn index 485ad6f..29ed435 100644 --- a/deps.edn +++ b/deps.edn @@ -1,8 +1,20 @@ {:deps - {org.clojure/clojure {:mvn/version "1.11.1"} - org.clojure/tools.reader {:mvn/version "1.3.6"} - org.clojure/data.json {:mvn/version "2.4.0"} - com.cemerick/pomegranate {:mvn/version "1.1.0"} + {org.clojure/clojure + {:mvn/version "1.11.1" + :changelog "https://github.com/clojure/clojure/blob/master/changes.md"} + + org.clojure/tools.reader + {:mvn/version "1.3.6" + :changelog "https://github.com/clojure/tools.reader/blob/master/CHANGELOG.md"} + + org.clojure/data.json + {:mvn/version "2.4.0" + :changelog "https://github.com/clojure/data.json#change-log"} + + clj-commons/pomegranate + {:mvn/version "1.2.1" + :changelog "https://github.com/clj-commons/pomegranate/blob/master/CHANGES.md"} + org.clojure/tools.cli {:mvn/version "1.0.214"} org.clojure/java.jdbc {:mvn/version "0.7.12"} org.xerial/sqlite-jdbc {:mvn/version "3.40.0.0"} @@ -39,10 +51,11 @@ :lint/fix {:extra-deps {cljfmt/cljfmt {:mvn/version "0.9.0"}} :main-opts ["-m" "cljfmt.main" "--file-pattern" "(? Date: Mon, 5 Dec 2022 08:49:41 +0800 Subject: [PATCH 08/12] Add changelog links to most dep specs --- deps.edn | 81 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/deps.edn b/deps.edn index 29ed435..ff2c862 100644 --- a/deps.edn +++ b/deps.edn @@ -15,41 +15,60 @@ {:mvn/version "1.2.1" :changelog "https://github.com/clj-commons/pomegranate/blob/master/CHANGES.md"} - org.clojure/tools.cli {:mvn/version "1.0.214"} - org.clojure/java.jdbc {:mvn/version "0.7.12"} - org.xerial/sqlite-jdbc {:mvn/version "3.40.0.0"} - squarepeg/squarepeg {:mvn/version "0.6.1"} - com.bhauman/rebel-readline {:mvn/version "0.1.4" - :exclusions [rewrite-cljs/rewrite-cljs]}} + org.clojure/tools.cli + {:mvn/version "1.0.214" + :changelog "https://github.com/clojure/tools.cli/blob/master/CHANGELOG.md"} + + org.clojure/java.jdbc + {:mvn/version "0.7.12" + :changelog "https://github.com/clojure/java.jdbc/blob/master/CHANGES.md"} + + org.xerial/sqlite-jdbc + {:mvn/version "3.40.0.0" + :changelog "https://github.com/xerial/sqlite-jdbc/releases"} + + squarepeg/squarepeg + {:mvn/version "0.6.1" + :changelog "https://github.com/ericnormand/squarepeg/tags"} + + com.bhauman/rebel-readline + {:mvn/version "0.1.4" + :exclusions [rewrite-cljs/rewrite-cljs]}} :paths ["src/common" "src/jvm" "resources"] :aliases - {:test {:extra-paths ["test"] - :extra-deps {io.github.cognitect-labs/test-runner - {:git/tag "v0.5.1" :git/sha "dfb30dd"}}} - - :run/test {:main-opts ["-m" "cognitect.test-runner"] - :exec-fn cognitect.test-runner.api/test - :homepage "https://github.com/cognitect-labs/test-runner"} - - :depstar {:extra-deps {seancorfield/depstar {:mvn/version "1.1.117"}}} - - :sci {:extra-paths ["src/closh-sci" "classes"] - :extra-deps {fipp/fipp {:mvn/version "0.6.26"} - org.babashka/sci {:mvn/version "0.5.36"} - borkdude/edamame {:mvn/version "1.0.16"} - com.bhauman/rebel-readline - {:git/url "https://github.com/dundalek/rebel-readline.git" - :sha "123be27a75de902233356e11ac66ac53cc5edc08" - :deps/root "rebel-readline" - :exclusions [rewrite-cljs/rewrite-cljs]}}} - - :lint {:extra-deps {cljfmt/cljfmt {:mvn/version "0.9.0"}} - :main-opts ["-m" "cljfmt.main" "--file-pattern" "(? Date: Mon, 5 Dec 2022 09:15:07 +0800 Subject: [PATCH 09/12] Upgrade depstar to 2.1.303 --- CHANGELOG.md | 1 + deps.edn | 7 ++++++- package.json | 2 +- scripts/compile-sci-uberjar | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b25c483..004039a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - Upgrade Cognitect test runner to v0.5.1 git tag - Upgrade kaocha to 1.71.1119 - Upgrade com.cemerick/pomegranate to 1.2.1 +- Upgrade depstar to 2.1.303 ## [0.5.0](https://github.com/dundalek/closh/compare/v0.4.1...v0.5.0) (2020-06-01) diff --git a/deps.edn b/deps.edn index ff2c862..49dbc84 100644 --- a/deps.edn +++ b/deps.edn @@ -49,7 +49,12 @@ :exec-fn cognitect.test-runner.api/test} :depstar - {:extra-deps {seancorfield/depstar {:mvn/version "1.1.117"}}} + {:exec-fn hf.depstar/uberjar + :exec-args {:aot true} + :replace-deps + {com.github.seancorfield/depstar + {:mvn/version "2.1.303" + :changelog "https://github.com/seancorfield/depstar/blob/develop/CHANGELOG.md"}}} :sci {:extra-paths ["src/closh-sci" "classes"] diff --git a/package.json b/package.json index 5e35790..5e3b13f 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "docker-start": "npm run docker-build && docker run --rm -it closh", "pkg-lumo": "pkg-lumo -c src/common:src/lumo -m closh.main", "pkg-java": "npm run compile-uberjar && scripts/wrap-jar.sh target/closh-zero.jar", - "compile-uberjar": "clojure -M:depstar -m hf.depstar.uberjar --compile -m closh.zero.frontend.rebel target/closh-zero.jar --verbose", + "compile-uberjar": "clojure -X:depstar :main-class closh.zero.frontend.rebel :jar target/closh-zero.jar :verbose true", "lint": "clojure -M:lint", "lint-fix": "clojure -M:lint:lint/fix", "lint-kondo": "clj-kondo --lint src:test", diff --git a/scripts/compile-sci-uberjar b/scripts/compile-sci-uberjar index f69e26b..39841e5 100755 --- a/scripts/compile-sci-uberjar +++ b/scripts/compile-sci-uberjar @@ -10,4 +10,4 @@ rm -rf classes mkdir classes clojure -Msci -e "(compile 'rebel-readline.line-reader-class)" clojure -Asci -Spom -clojure -M:depstar:sci -m hf.depstar.uberjar --compile -m closh.zero.frontend.sci-rebel "$jar" # --verbose +clojure -X:depstar :aliases '[:sci]' :main-class closh.zero.frontend.sci-rebel :jar "$jar" :verbose true From 71d7959f8959f13eb695b38987428a85b7a5bacd Mon Sep 17 00:00:00 2001 From: Tamas Herman Date: Mon, 5 Dec 2022 09:42:17 +0800 Subject: [PATCH 10/12] Upgrade CircleCI images --- .circleci/config.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index be4e678..d2a0740 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: lint: docker: - - image: circleci/clojure:openjdk-11-tools-deps-1.10.1.697-node + - image: cimg/clojure:1.11.1-openjdk-11.0-node working_directory: ~/repo @@ -15,7 +15,7 @@ jobs: - restore_cache: # restores saved cache if checksum hasn't changed since the last run key: clj-dependencies-{{ checksum "deps.edn" }} - - run: clojure -Mlint + - run: clojure -M:lint - save_cache: # generate and store cache in the .m2 directory using a key template paths: @@ -51,7 +51,7 @@ jobs: test-linux-clj-jdk8: docker: - - image: circleci/clojure:openjdk-8-tools-deps-1.10.1.697-node + - image: cimg/clojure:1.11.1-openjdk-8.0-node working_directory: ~/repo @@ -64,7 +64,7 @@ jobs: - run: sudo apt-get -y install bc # run tests - - run: CI_ENV=1 clojure -Mtest -m cognitect.test-runner + - run: CI_ENV=1 clojure -X:test:run/test - save_cache: # generate and store cache in the .m2 directory using a key template paths: @@ -74,7 +74,7 @@ jobs: test-linux-clj-sci-jdk8: docker: - - image: circleci/clojure:openjdk-8-tools-deps-1.10.1.697-node + - image: cimg/clojure:1.11.1-openjdk-8.0-node working_directory: ~/repo @@ -87,7 +87,7 @@ jobs: - run: sudo apt-get -y install bc # run tests - - run: env CI_ENV=1 __CLOSH_USE_SCI_EVAL__=1 clojure -M:sci:test -m cognitect.test-runner + - run: env CI_ENV=1 __CLOSH_USE_SCI_EVAL__=1 clojure -X:sci:test:run/test - save_cache: # generate and store cache in the .m2 directory using a key template paths: @@ -97,7 +97,7 @@ jobs: test-linux-clj-jdk11: docker: - - image: circleci/clojure:openjdk-11-tools-deps-1.10.1.697-node + - image: cimg/clojure:1.11.1-openjdk-11.0-node working_directory: ~/repo @@ -110,7 +110,7 @@ jobs: - run: sudo apt-get -y install bc # run tests - - run: CI_ENV=1 clojure -Mtest -m cognitect.test-runner + - run: CI_ENV=1 clojure -X:test:run/test - save_cache: # generate and store cache in the .m2 directory using a key template paths: @@ -120,7 +120,7 @@ jobs: test-linux-clj-sci-jdk11: docker: - - image: circleci/clojure:openjdk-11-tools-deps-1.10.1.697-node + - image: cimg/clojure:1.11.1-openjdk-11.0-node working_directory: ~/repo @@ -133,7 +133,7 @@ jobs: - run: sudo apt-get -y install bc # run tests - - run: CI_ENV=1 __CLOSH_USE_SCI_EVAL__=1 clojure -M:sci:test -m cognitect.test-runner + - run: CI_ENV=1 __CLOSH_USE_SCI_EVAL__=1 clojure -X:sci:test:run/test - save_cache: # generate and store cache in the .m2 directory using a key template paths: @@ -143,7 +143,7 @@ jobs: test-macos-cljs: macos: - xcode: "11.3.1" + xcode: "13.4.1" working_directory: /Users/distiller/project @@ -169,7 +169,7 @@ jobs: test-macos-clj: macos: - xcode: "11.3.1" + xcode: "13.4.1" working_directory: /Users/distiller/project @@ -184,7 +184,7 @@ jobs: - run: brew install clojure bc # run tests - - run: CI_ENV=1 clojure -Mtest -m cognitect.test-runner + - run: CI_ENV=1 clojure -X:test:run/test - save_cache: paths: @@ -194,7 +194,7 @@ jobs: test-macos-clj-sci: macos: - xcode: "11.3.1" + xcode: "13.4.1" working_directory: /Users/distiller/project @@ -209,7 +209,7 @@ jobs: - run: brew install clojure bc # run tests - - run: CI_ENV=1 __CLOSH_USE_SCI_EVAL__=1 clojure -M:sci:test -m cognitect.test-runner + - run: CI_ENV=1 __CLOSH_USE_SCI_EVAL__=1 clojure -X:sci:test:run/test - save_cache: paths: From cbd593679adb239167dffaa0d24f1c8dbb48e1f1 Mon Sep 17 00:00:00 2001 From: Tamas Herman Date: Mon, 5 Dec 2022 09:42:27 +0800 Subject: [PATCH 11/12] Disable CLJS builds --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d2a0740..4a0997d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -222,11 +222,11 @@ workflows: test: jobs: - lint - - test-linux-cljs +# - test-linux-cljs - test-linux-clj-jdk8 - test-linux-clj-jdk11 - test-linux-clj-sci-jdk8 - test-linux-clj-sci-jdk11 - - test-macos-cljs +# - test-macos-cljs - test-macos-clj - test-macos-clj-sci From 960e4ade7cacb6d50e4726051eae08b391494365 Mon Sep 17 00:00:00 2001 From: Tamas Herman Date: Mon, 5 Dec 2022 10:30:20 +0800 Subject: [PATCH 12/12] Install `bc` on CI correctly --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a0997d..b90352e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,7 @@ jobs: - restore_cache: # restores saved cache if checksum hasn't changed since the last run key: clj-dependencies-{{ checksum "deps.edn" }} - - run: sudo apt-get -y install bc + - run: sudo apt-get update && sudo apt-get install -y bc # run tests - run: CI_ENV=1 clojure -X:test:run/test @@ -84,7 +84,7 @@ jobs: - restore_cache: # restores saved cache if checksum hasn't changed since the last run key: clj-sci-dependencies-{{ checksum "deps.edn" }} - - run: sudo apt-get -y install bc + - run: sudo apt-get update && sudo apt-get install -y bc # run tests - run: env CI_ENV=1 __CLOSH_USE_SCI_EVAL__=1 clojure -X:sci:test:run/test @@ -107,7 +107,7 @@ jobs: - restore_cache: # restores saved cache if checksum hasn't changed since the last run key: clj-jdk11-dependencies-{{ checksum "deps.edn" }} - - run: sudo apt-get -y install bc + - run: sudo apt-get update && sudo apt-get install -y bc # run tests - run: CI_ENV=1 clojure -X:test:run/test @@ -130,7 +130,7 @@ jobs: - restore_cache: # restores saved cache if checksum hasn't changed since the last run key: clj-jdk11-sci-dependencies-{{ checksum "deps.edn" }} - - run: sudo apt-get -y install bc + - run: sudo apt-get update && sudo apt-get install -y bc # run tests - run: CI_ENV=1 __CLOSH_USE_SCI_EVAL__=1 clojure -X:sci:test:run/test