From 76011953b88bb112c44e6773e43dd04ede879420 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 5 May 2025 20:48:14 -0400 Subject: [PATCH 1/2] test libs: re-enable refactor-nrepl Its tests seem to be passing again See: https://github.com/clojure-emacs/refactor-nrepl/issues/409 --- .github/workflows/libs-test.yml | 5 +---- deps.edn | 1 - script/test_libs.clj | 8 +++----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/libs-test.yml b/.github/workflows/libs-test.yml index fccd6074..a0965362 100644 --- a/.github/workflows/libs-test.yml +++ b/.github/workflows/libs-test.yml @@ -51,13 +51,10 @@ jobs: clj-cache-prefix: clj-libs-deps-${{ matrix.lib-name }} clj-cache-hash-files: "'script/test_libs.clj','deps.edn','bb.edn'" - ## Lein version > 2.10.0 is causing refactor-nrepl to fail, so explicitly install a version that works - ## instead of using lein bundled with github actions image. - ## Upcoming 2.11.2 might fix, can optionally revisit in the future. - name: Install Lein uses: DeLaGuardo/setup-clojure@13.2 with: - lein: 2.10.0 + lein: 2.11.2 - name: Install Planck uses: ./.github/workflows/setup-planck diff --git a/deps.edn b/deps.edn index 1842486e..3a14637c 100644 --- a/deps.edn +++ b/deps.edn @@ -180,5 +180,4 @@ "--exclude=org.clojure/clojurescript@1.11.121" ;; no evidence yet that this is an official release "--exclude=technomancy/leiningen@2.11.0" ;; exclude for refactor-nrepl lib test "--exclude=technomancy/leiningen@2.11.1" ;; exclude for refactor-nrepl lib test - "--exclude=technomancy/leiningen@2.11.2" ;; exclude for refactor-nrepl lib test ]}}} diff --git a/script/test_libs.clj b/script/test_libs.clj index af4cad66..786c912c 100755 --- a/script/test_libs.clj +++ b/script/test_libs.clj @@ -215,8 +215,7 @@ ;; ;; refactor-nrepl ;; -;; uncomment we we re-enable -#_(defn- refactor-nrepl-patch +(defn- refactor-nrepl-patch "custom because my generic does not handle ^:inline-dep syntax" [{:keys [home-dir rewrite-clj-version]}] (status/line :detail "=> Patching deps") @@ -420,9 +419,8 @@ :patch-fn deps-edn-v1-patch :show-deps-fn cli-deps-tree :test-cmds ["clojure -M:test"]} - ;; temporarily disable, see https://github.com/clojure-emacs/refactor-nrepl/issues/409 - #_{:name "refactor-nrepl" - :version "3.10.0" + {:name "refactor-nrepl" + :version "3.11.0" :platforms [:clj] :github-release {:repo "clojure-emacs/refactor-nrepl" :via :tag From 98931991078ae563232e24be43115b71d40bb7a8 Mon Sep 17 00:00:00 2001 From: lread Date: Mon, 5 May 2025 20:48:57 -0400 Subject: [PATCH 2/2] dev: bump deps --- deps.edn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.edn b/deps.edn index 3a14637c..bfd28d2a 100644 --- a/deps.edn +++ b/deps.edn @@ -36,11 +36,11 @@ {;; for disabling the official compiler :classpath-overrides {org.clojure/clojure nil} :extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.0-9"} - com.github.flow-storm/flow-storm-dbg {:mvn/version "4.4.0"}} + com.github.flow-storm/flow-storm-dbg {:mvn/version "4.4.1"}} :jvm-opts ["-Dclojure.storm.instrumentEnable=true"]} :nrepl/jvm - {:extra-deps {refactor-nrepl/refactor-nrepl {:mvn/version "3.10.0"}} + {:extra-deps {refactor-nrepl/refactor-nrepl {:mvn/version "3.11.0"}} :jvm-opts ["-Djdk.attach.allowAttachSelf"] :main-opts ["-m" "nrepl.cmdline" "--middleware" "[refactor-nrepl.middleware/wrap-refactor cider.nrepl/cider-middleware]"