emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(cli): ci.el loader

Browse source 
- :before ci will try to load $REPOROOT/ci.el or $DOOMDIR/ci.el. It
  finds $REPOROOT by calling `git`, but doesn't handle errors. Now it
  does.
- Because &rest was in :before ci's argspec, :before ci * subcommands
  would be inaccessible (not that any exist atm, though).
- Let the user know when it finds the project's ci.el.
This commit is contained in:
Henrik Lissner 2022-06-19 22:13:20 +02:00
parent 7862a9e15d
commit 50a0c2ef46
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/cli/ci.el
View file

@ -247,15 +247,18 @@ Note: warnings are not considered failures.")
;;; Commands ;;; Commands
;;; doom ci ;;; doom ci
(defcli! (:before ci) (&rest _) (defcli! (:before ci) (&args _)
(when-let* (when-let*
((repo-root (or (cdr (doom-call-process "git" "rev-parse" "--show-toplevel")) ((repo-root
default-directory)) (if-let* ((result (sh! "git" "rev-parse" "--show-toplevel"))
((zerop (car result))))
(cdr result)
default-directory))
(local-config (local-config
(car (or (doom-glob repo-root "ci.el") (car (or (doom-glob repo-root "ci.el")
(doom-glob doom-private-dir "ci.el"))))) (doom-glob doom-private-dir "ci.el")))))
(print! (item "Loading %s") (path local-config)) (load local-config nil t t)
(load local-config nil t t))) (print! (item "Loaded %S") local-config)))
(defcli! ci () (defcli! ci ()
"Commands that automate development processes." "Commands that automate development processes."