diff --git a/.doom.d/config.el b/.doom.d/config.el index 17f5d8f..a0cd48d 100644 --- a/.doom.d/config.el +++ b/.doom.d/config.el @@ -64,7 +64,7 @@ (all-the-icons-ivy-rich-mode 1)) (use-package! mgr-gitlab - :load-path "~/.doom.d/lisp/mgr-gitlab" + :load-path "lisp/mgr-gitlab" :ensure t :config (setq gitlab-host "gitlab.maxregan.me" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 047b957..0e2fe9e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,17 +5,23 @@ stages: - test -sast: - stage: test +variables: + GIT_SUBMODULE_STRATEGY: recursive + DOOMDIR: ./.doom.d + EMACSDIR: ./.emacs.d + DOOMLOCALDIR: ./.emacs.d/local test-emacs: stage: test - image: ubuntu:latest + image: ubuntu:22.04 before_script: - apt-get update - - apt-get install -y emacs-nox + - apt-get install -y emacs-nox git + - yes | ./.emacs.d/bin/doom install || true script: - ./.mgr_config/tests/test-emacs.sh +sast: + stage: test include: - template: Security/SAST.gitlab-ci.yml diff --git a/.mgr_config/tests/test-emacs.sh b/.mgr_config/tests/test-emacs.sh index a86957f..c85d693 100755 --- a/.mgr_config/tests/test-emacs.sh +++ b/.mgr_config/tests/test-emacs.sh @@ -1,3 +1,3 @@ #!/bin/bash -emacs --batch -u "$(whoami)" --debug-init +emacs --batch --debug-init --load ./.emacs.d/init.el