From 2db9ee328c89010332cf64a28e106331521f1886 Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Mon, 12 Jun 2023 16:40:34 +0300 Subject: [PATCH 1/4] Check cljdoc analysis on gha --- .github/workflows/testsuite.yml | 19 ++++++++++++++++++- scripts/cljdoc-check.sh | 7 +++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 scripts/cljdoc-check.sh diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml index d2f0105b..c711d1e3 100644 --- a/.github/workflows/testsuite.yml +++ b/.github/workflows/testsuite.yml @@ -70,9 +70,26 @@ jobs: run: ./scripts/test.sh cljs lint: - name: Lint + name: Lint cljdoc.edn runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Verify cljdoc.edn run: curl -fsSL https://raw.githubusercontent.com/cljdoc/cljdoc/master/script/verify-cljdoc-edn | bash -s doc/cljdoc.edn + + check-cljdoc: + name: Check cljdoc analysis + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Setup Clojure + uses: DeLaGuardo/setup-clojure@11.0 + with: + lein: 2.9.5 + cli: 1.11.0.1100 + - name: Build jars so that CljDoc analyze can use it + run: ./scripts/lein-modules install + - name: Install cljdoc analyzer + run: clojure -Ttools install io.github.cljdoc/cljdoc-analyzer '{:git/tag "RELEASE"}' :as cljdoc-analyzer + - name: CljDoc Check + run: ./scripts/cljdoc-check.sh diff --git a/scripts/cljdoc-check.sh b/scripts/cljdoc-check.sh new file mode 100755 index 00000000..510a99fe --- /dev/null +++ b/scripts/cljdoc-check.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +for i in modules/*; do + cd $i + clojure -J-Dclojure.main.report=stderr -Tcljdoc-analyzer analyze-local + cd ../.. +done From ac410507f24f91eac2744dc477b9508d1993a9d0 Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Mon, 12 Jun 2023 17:50:10 +0300 Subject: [PATCH 2/4] Fix reitit-dev deps --- modules/reitit-dev/project.clj | 3 ++- project.clj | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/reitit-dev/project.clj b/modules/reitit-dev/project.clj index d1e6855f..61e5b438 100644 --- a/modules/reitit-dev/project.clj +++ b/modules/reitit-dev/project.clj @@ -11,4 +11,5 @@ :dependencies [[metosin/reitit-core] [com.bhauman/spell-spec] [expound] - [fipp]]) + [fipp] + [mvxcvi/arrangement]]) diff --git a/project.clj b/project.clj index fc210596..19e473f5 100644 --- a/project.clj +++ b/project.clj @@ -48,6 +48,7 @@ [expound "0.9.0"] [lambdaisland/deep-diff "0.0-47"] [com.bhauman/spell-spec "0.1.2"] + [mvxcvi/arrangement "2.1.0"] [ring/ring-core "1.10.0"] [io.pedestal/pedestal.service "0.5.10"]] From cf5906030a69bdd167a4de969885b74f1213fab2 Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Mon, 12 Jun 2023 17:57:51 +0300 Subject: [PATCH 3/4] Reitit-dev fixes --- modules/reitit-dev/project.clj | 1 + project.clj | 2 ++ scripts/cljdoc-check.sh | 2 ++ 3 files changed, 5 insertions(+) diff --git a/modules/reitit-dev/project.clj b/modules/reitit-dev/project.clj index 61e5b438..cacc07b8 100644 --- a/modules/reitit-dev/project.clj +++ b/modules/reitit-dev/project.clj @@ -12,4 +12,5 @@ [com.bhauman/spell-spec] [expound] [fipp] + [org.clojure/core.rrb-vector] [mvxcvi/arrangement]]) diff --git a/project.clj b/project.clj index 19e473f5..e4ffbc57 100644 --- a/project.clj +++ b/project.clj @@ -45,6 +45,8 @@ [meta-merge "1.0.0"] [fipp "0.6.26" :exclusions [org.clojure/core.rrb-vector]] + ;; Deep-diff uses this version, override olders versiom from fipp. + [org.clojure/core.rrb-vector "0.0.14"] [expound "0.9.0"] [lambdaisland/deep-diff "0.0-47"] [com.bhauman/spell-spec "0.1.2"] diff --git a/scripts/cljdoc-check.sh b/scripts/cljdoc-check.sh index 510a99fe..ebcd3908 100755 --- a/scripts/cljdoc-check.sh +++ b/scripts/cljdoc-check.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + for i in modules/*; do cd $i clojure -J-Dclojure.main.report=stderr -Tcljdoc-analyzer analyze-local From a032abc9106906abe1c0ac7a909bea51be67a9e0 Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Mon, 12 Jun 2023 18:15:53 +0300 Subject: [PATCH 4/4] Fix interceptors deps --- .github/workflows/testsuite.yml | 2 -- modules/reitit-interceptors/project.clj | 3 ++- scripts/cljdoc-check.sh | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml index c711d1e3..47f70b8d 100644 --- a/.github/workflows/testsuite.yml +++ b/.github/workflows/testsuite.yml @@ -87,8 +87,6 @@ jobs: with: lein: 2.9.5 cli: 1.11.0.1100 - - name: Build jars so that CljDoc analyze can use it - run: ./scripts/lein-modules install - name: Install cljdoc analyzer run: clojure -Ttools install io.github.cljdoc/cljdoc-analyzer '{:git/tag "RELEASE"}' :as cljdoc-analyzer - name: CljDoc Check diff --git a/modules/reitit-interceptors/project.clj b/modules/reitit-interceptors/project.clj index aa9d74b8..a887d7d4 100644 --- a/modules/reitit-interceptors/project.clj +++ b/modules/reitit-interceptors/project.clj @@ -11,4 +11,5 @@ :inherit [:deploy-repositories :managed-dependencies]} :dependencies [[metosin/reitit-ring] [lambdaisland/deep-diff] - [metosin/muuntaja]]) + [metosin/muuntaja] + [metosin/spec-tools]]) diff --git a/scripts/cljdoc-check.sh b/scripts/cljdoc-check.sh index ebcd3908..a8b4e005 100755 --- a/scripts/cljdoc-check.sh +++ b/scripts/cljdoc-check.sh @@ -2,6 +2,11 @@ set -e +# Need pom and jar for analyze local. +# Need repo version installed to the local m2 for up-to-date dependencies between modules. +# Install will run jar and pom tasks already. +./scripts/lein-modules install + for i in modules/*; do cd $i clojure -J-Dclojure.main.report=stderr -Tcljdoc-analyzer analyze-local