Skip to content

Commit 078d8c7

Browse files
authored
test & dev: maint (#382)
* test libs: re-enable refactor-nrepl Its tests seem to be passing again See: clojure-emacs/refactor-nrepl#409 * dev: bump deps
1 parent f69e17e commit 078d8c7

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

.github/workflows/libs-test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,10 @@ jobs:
5151
clj-cache-prefix: clj-libs-deps-${{ matrix.lib-name }}
5252
clj-cache-hash-files: "'script/test_libs.clj','deps.edn','bb.edn'"
5353

54-
## Lein version > 2.10.0 is causing refactor-nrepl to fail, so explicitly install a version that works
55-
## instead of using lein bundled with github actions image.
56-
## Upcoming 2.11.2 might fix, can optionally revisit in the future.
5754
- name: Install Lein
5855
uses: DeLaGuardo/[email protected]
5956
with:
60-
lein: 2.10.0
57+
lein: 2.11.2
6158

6259
- name: Install Planck
6360
uses: ./.github/workflows/setup-planck

deps.edn

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
{;; for disabling the official compiler
3737
:classpath-overrides {org.clojure/clojure nil}
3838
:extra-deps {com.github.flow-storm/clojure {:mvn/version "1.12.0-9"}
39-
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.4.0"}}
39+
com.github.flow-storm/flow-storm-dbg {:mvn/version "4.4.1"}}
4040
:jvm-opts ["-Dclojure.storm.instrumentEnable=true"]}
4141

4242
:nrepl/jvm
43-
{:extra-deps {refactor-nrepl/refactor-nrepl {:mvn/version "3.10.0"}}
43+
{:extra-deps {refactor-nrepl/refactor-nrepl {:mvn/version "3.11.0"}}
4444
:jvm-opts ["-Djdk.attach.allowAttachSelf"]
4545
:main-opts ["-m" "nrepl.cmdline"
4646
"--middleware" "[refactor-nrepl.middleware/wrap-refactor cider.nrepl/cider-middleware]"
@@ -180,5 +180,4 @@
180180
"--exclude=org.clojure/[email protected]" ;; no evidence yet that this is an official release
181181
"--exclude=technomancy/[email protected]" ;; exclude for refactor-nrepl lib test
182182
"--exclude=technomancy/[email protected]" ;; exclude for refactor-nrepl lib test
183-
"--exclude=technomancy/[email protected]" ;; exclude for refactor-nrepl lib test
184183
]}}}

script/test_libs.clj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,7 @@
215215
;;
216216
;; refactor-nrepl
217217
;;
218-
;; uncomment we we re-enable
219-
#_(defn- refactor-nrepl-patch
218+
(defn- refactor-nrepl-patch
220219
"custom because my generic does not handle ^:inline-dep syntax"
221220
[{:keys [home-dir rewrite-clj-version]}]
222221
(status/line :detail "=> Patching deps")
@@ -420,9 +419,8 @@
420419
:patch-fn deps-edn-v1-patch
421420
:show-deps-fn cli-deps-tree
422421
:test-cmds ["clojure -M:test"]}
423-
;; temporarily disable, see https://github.com/clojure-emacs/refactor-nrepl/issues/409
424-
#_{:name "refactor-nrepl"
425-
:version "3.10.0"
422+
{:name "refactor-nrepl"
423+
:version "3.11.0"
426424
:platforms [:clj]
427425
:github-release {:repo "clojure-emacs/refactor-nrepl"
428426
:via :tag

0 commit comments

Comments
 (0)