refactor(wpcarro/emacs): Drop meta.ci.extraSteps

...in favor of `meta.targets = [ "check" ]`.

Change-Id: I08b035b7d7bbe5ef4eab10a9f55481048c67330a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5104
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI
This commit is contained in:
William Carroll 2022-01-28 12:40:11 -08:00 committed by wpcarro
parent 4b8998c9c8
commit 45da3bce86
4 changed files with 27 additions and 31 deletions

View file

@ -225,8 +225,9 @@
(use-package yasnippet
:config
(setq yas-snippet-dirs (list (f-join user-emacs-directory "snippets")))
(yas-global-mode 1))
(unless constants-ci?
(setq yas-snippet-dirs (list (f-join user-emacs-directory "snippets")))
(yas-global-mode 1)))
(use-package projectile
:config

View file

@ -110,16 +110,17 @@
(use-package ivy-prescient
:config
(ivy-prescient-mode 1)
(prescient-persist-mode 1))
(unless constants-ci?
(prescient-persist-mode 1)))
(use-package ivy-pass)
;; all-the-icons
(use-package all-the-icons
:config
(when (not constants-ci?)
(unless (f-exists? "~/.local/share/fonts/all-the-icons.ttf")
(all-the-icons-install-fonts t))))
(unless (or constants-ci?
(f-exists? "~/.local/share/fonts/all-the-icons.ttf"))
(all-the-icons-install-fonts t)))
;; icons for Ivy
(use-package all-the-icons-ivy

View file

@ -40,5 +40,5 @@
(message "Encountered warnings in *Warnings* buffer: %s" (buffer-string)))
(kill-emacs 1)))
(message "Successfully init'd Emacs without encountering errors or warnings!")
(message "Successfully initialized Emacs without errors or warnings!")
(kill-emacs 0)

View file

@ -6,7 +6,7 @@ let
inherit (builtins) path;
inherit (depot.third_party.nixpkgs) emacsPackagesGen emacs27;
inherit (depot.users) wpcarro;
inherit (pkgs) writeShellScript writeShellScriptBin;
inherit (pkgs) runCommand writeShellScriptBin;
inherit (lib) mapAttrsToList;
inherit (lib.strings) concatStringsSep makeBinPath;
@ -165,20 +165,6 @@ let
--load ${initEl} \
"$@"
'';
# I need this to start my Emacs from CI without the call to
# `--load ${initEl}`.
runScript = script: writeShellScript "run-emacs-script" ''
export PATH="${emacsBinPath}:$PATH"
export EMACSLOADPATH="${loadPath}"
exec ${wpcarrosEmacs}/bin/emacs \
--no-site-file \
--no-site-lisp \
--no-init-file \
--script ${script} \
"$@"
'';
in {
inherit withEmacsPath;
@ -186,13 +172,21 @@ in {
emacsBin = "${wpcarrosEmacs}/bin/emacs";
};
meta = {
targets = [ "nixos" ];
extraSteps = [
{
label = ":gnu: initialize Emacs";
command = "${runScript ./ci.el} ${./.emacs.d/init.el}";
}
];
};
# Script that asserts my Emacs can initialize without warnings or errors.
check = runCommand "check-emacs" {} ''
# Even though Buildkite defines this, I'd still like still be able to test
# this locally without depending on my ability to remember to set CI=true.
export CI=true
export PATH="${emacsBinPath}:$PATH"
export EMACSLOADPATH="${loadPath}"
${wpcarrosEmacs}/bin/emacs \
--no-site-file \
--no-site-lisp \
--no-init-file \
--script ${./ci.el} \
${./.emacs.d/init.el} && \
touch $out
'';
meta.targets = [ "nixos" "check" ];
}