From f6ec872f7cd9479051e50a7c22a3844017b199bb Mon Sep 17 00:00:00 2001 From: Peter Taoussanis Date: Fri, 20 Jun 2025 11:01:15 +0200 Subject: [PATCH] [nop] Update project template --- .../{main-tests.yml => clj-tests.yml} | 8 ++---- .github/workflows/cljs-tests.yml | 27 +++++++++++++++++++ .github/workflows/graal-tests.yml | 9 +++++-- README.md | 11 +++++--- 4 files changed, 43 insertions(+), 12 deletions(-) rename .github/workflows/{main-tests.yml => clj-tests.yml} (92%) create mode 100644 .github/workflows/cljs-tests.yml diff --git a/.github/workflows/main-tests.yml b/.github/workflows/clj-tests.yml similarity index 92% rename from .github/workflows/main-tests.yml rename to .github/workflows/clj-tests.yml index 8534ab9..43756f1 100644 --- a/.github/workflows/main-tests.yml +++ b/.github/workflows/clj-tests.yml @@ -1,4 +1,4 @@ -name: Main tests +name: Clj tests on: [push, pull_request] jobs: @@ -7,7 +7,6 @@ jobs: matrix: java: ['17', '19', '21'] os: [ubuntu-latest] - runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -15,17 +14,14 @@ jobs: with: distribution: 'corretto' java-version: ${{ matrix.java }} - - uses: DeLaGuardo/setup-clojure@12.5 with: lein: latest - - uses: actions/cache@v4 id: cache-deps with: path: ~/.m2/repository key: deps-${{ hashFiles('main/project.clj') }} restore-keys: deps- - - - run: lein test-all + - run: lein test-clj working-directory: main diff --git a/.github/workflows/cljs-tests.yml b/.github/workflows/cljs-tests.yml new file mode 100644 index 0000000..48d3c2f --- /dev/null +++ b/.github/workflows/cljs-tests.yml @@ -0,0 +1,27 @@ +name: Cljs tests +on: [push, pull_request] + +jobs: + tests: + strategy: + matrix: + java: ['21'] + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: 'corretto' + java-version: ${{ matrix.java }} + - uses: DeLaGuardo/setup-clojure@12.5 + with: + lein: latest + - uses: actions/cache@v4 + id: cache-deps + with: + path: ~/.m2/repository + key: deps-${{ hashFiles('main/project.clj') }} + restore-keys: deps- + - run: lein test-cljs + working-directory: main diff --git a/.github/workflows/graal-tests.yml b/.github/workflows/graal-tests.yml index c567516..2f03638 100644 --- a/.github/workflows/graal-tests.yml +++ b/.github/workflows/graal-tests.yml @@ -2,7 +2,7 @@ name: Graal tests on: [push, pull_request] jobs: - test: + tests: strategy: matrix: java: ['17'] @@ -29,5 +29,10 @@ jobs: key: deps-${{ hashFiles('main/project.clj') }} restore-keys: deps- - - run: bb graal-tests + - name: Run Graal tests + run: bb graal-tests working-directory: main + +# - name: Run Babashka tests +# run: bb bb-tests +# working-directory: main diff --git a/README.md b/README.md index 4a84562..07c76fc 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,8 @@ See [quick examples](#quick-examples) or the [wiki](../../wiki/1-Getting-started - `2025-05-27` `v1.0.1`: [release info](../../releases/tag/v1.0.1) -[![Main tests][Main tests SVG]][Main tests URL] +[![Clj tests][Clj tests SVG]][Clj tests URL] +[![Cljs tests][Cljs tests SVG]][Cljs tests URL] [![Graal tests][Graal tests SVG]][Graal tests URL] @@ -377,7 +378,9 @@ Licensed under [EPL 1.0](LICENSE.txt) (same as Clojure). [Clojars SVG]: https://img.shields.io/clojars/v/com.taoensso/telemere.svg [Clojars URL]: https://clojars.org/com.taoensso/telemere -[Main tests SVG]: https://github.com/taoensso/telemere/actions/workflows/main-tests.yml/badge.svg -[Main tests URL]: https://github.com/taoensso/telemere/actions/workflows/main-tests.yml +[Clj tests SVG]: https://github.com/taoensso/telemere/actions/workflows/clj-tests.yml/badge.svg +[Clj tests URL]: https://github.com/taoensso/telemere/actions/workflows/clj-tests.yml +[Cljs tests SVG]: https://github.com/taoensso/telemere/actions/workflows/cljs-tests.yml/badge.svg +[Cljs tests URL]: https://github.com/taoensso/telemere/actions/workflows/cljs-tests.yml [Graal tests SVG]: https://github.com/taoensso/telemere/actions/workflows/graal-tests.yml/badge.svg -[Graal tests URL]: https://github.com/taoensso/telemere/actions/workflows/graal-tests.yml +[Graal tests URL]: https://github.com/taoensso/telemere/actions/workflows/graal-tests.yml \ No newline at end of file