From e45600c5f84d51cf8b63d3ee7385645cd421bd1d Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Thu, 29 Feb 2024 13:57:29 +0100 Subject: [PATCH] [nop] Update project template --- .github/workflows/graal-tests.yml | 6 +++--- .github/workflows/main-tests.yml | 8 ++++---- README.md | 6 +++--- project.clj | 5 +++-- src/taoensso/timbre.cljc | 2 -- test/taoensso/timbre_tests.cljc | 6 ++++++ wiki/Home.md | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/graal-tests.yml b/.github/workflows/graal-tests.yml index b2ea89be..14495f43 100644 --- a/.github/workflows/graal-tests.yml +++ b/.github/workflows/graal-tests.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: graalvm/setup-graalvm@v1 with: version: 'latest' @@ -18,12 +18,12 @@ jobs: components: 'native-image' github-token: ${{ secrets.GITHUB_TOKEN }} - - uses: DeLaGuardo/setup-clojure@10.0 + - uses: DeLaGuardo/setup-clojure@12.5 with: lein: latest bb: latest - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.m2/repository key: deps-${{ hashFiles('deps.edn') }} diff --git a/.github/workflows/main-tests.yml b/.github/workflows/main-tests.yml index 900a96e2..faa64d6c 100644 --- a/.github/workflows/main-tests.yml +++ b/.github/workflows/main-tests.yml @@ -10,17 +10,17 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'corretto' java-version: ${{ matrix.java }} - - uses: DeLaGuardo/setup-clojure@10.0 + - uses: DeLaGuardo/setup-clojure@12.5 with: lein: latest - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cache-deps with: path: ~/.m2/repository diff --git a/README.md b/README.md index fe054116..866fb375 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Supports optional interop with [tools.logging](https://github.com/taoensso/timbr ## Latest release/s -- `2024-02-26` `v6.5.0` (stable): [changes](../../releases/tag/v6.5.0) +- `2024-02-26` `v6.5.0` (stable): [release info](../../releases/tag/v6.5.0) [![Main tests][Main tests SVG]][Main tests URL] [![Graal tests][Graal tests SVG]][Graal tests URL] @@ -35,7 +35,7 @@ See [here][GitHub releases] for earlier releases. ## Documentation - [Wiki][GitHub wiki] (getting started, usage, etc.) -- API reference: [Codox][Codox docs], [clj-doc][clj-doc docs] +- API reference: [cljdoc][cljdoc docs], [Codox][Codox docs] ## Funding @@ -58,7 +58,7 @@ Licensed under [EPL 1.0](LICENSE.txt) (same as Clojure). [Codox docs]: https://taoensso.github.io/timbre/ -[clj-doc docs]: https://cljdoc.org/d/com.taoensso/timbre/ +[cljdoc docs]: https://cljdoc.org/d/com.taoensso/timbre/ [Clojars SVG]: https://img.shields.io/clojars/v/com.taoensso/timbre.svg [Clojars URL]: https://clojars.org/com.taoensso/timbre diff --git a/project.clj b/project.clj index bee35bd6..6d31cfdb 100644 --- a/project.clj +++ b/project.clj @@ -17,6 +17,7 @@ {;; :default [:base :system :user :provided :dev] :provided {:dependencies [[org.clojure/clojurescript "1.11.132"] [org.clojure/clojure "1.11.1"]]} + :c1.12 {:dependencies [[org.clojure/clojure "1.12.0-alpha9"]]} :c1.11 {:dependencies [[org.clojure/clojure "1.11.1"]]} :c1.10 {:dependencies [[org.clojure/clojure "1.10.1"]]} :c1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]} @@ -103,6 +104,6 @@ "deploy-lib" ["with-profile" "+deploy" "do" ["build-once"] ["deploy" "clojars"] ["install"]] - "test-clj" ["with-profile" "+c1.11:+c1.10:+c1.9" "test"] - "test-cljs" ["with-profile" "+test" "cljsbuild" "test"] + "test-clj" ["with-profile" "+c1.12:+c1.11:+c1.10:+c1.9" "test"] + "test-cljs" ["with-profile" "+c1.12" "cljsbuild" "test"] "test-all" ["do" ["clean"] ["test-clj"] ["test-cljs"]]}) diff --git a/src/taoensso/timbre.cljc b/src/taoensso/timbre.cljc index 10d81681..48a119fb 100644 --- a/src/taoensso/timbre.cljc +++ b/src/taoensso/timbre.cljc @@ -346,8 +346,6 @@ ([color x y ] (str (ansi-color color) x y ansi-reset)) ([color x y & more] (str (ansi-color color) x y (apply str more) ansi-reset))))) -#?(:clj (def default-out (java.io.OutputStreamWriter. System/out))) -#?(:clj (def default-err (java.io.PrintWriter. System/err))) #?(:clj (defmacro with-default-outs [& body] `(binding [*out* default-out, *err* default-err] ~@body))) diff --git a/test/taoensso/timbre_tests.cljc b/test/taoensso/timbre_tests.cljc index 636d6c77..a36b9f5b 100644 --- a/test/taoensso/timbre_tests.cljc +++ b/test/taoensso/timbre_tests.cljc @@ -140,4 +140,10 @@ ;;;; +#?(:cljs + (defmethod test/report [:cljs.test/default :end-run-tests] [m] + (when-not (test/successful? m) + ;; Trigger non-zero `lein test-cljs` exit code for CI + (throw (ex-info "ClojureScript tests failed" {}))))) + #?(:cljs (test/run-tests)) diff --git a/wiki/Home.md b/wiki/Home.md index af3d5915..bc53b936 100644 --- a/wiki/Home.md +++ b/wiki/Home.md @@ -1,4 +1,4 @@ -See the menu to the right for content 👉 +See the **menu to the right** for content 👉 # Contributions welcome