aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2019-08-23 22:10:47 -0700
committerGravatar Tom Willemse2019-08-23 22:10:47 -0700
commit7a2d6c1165c4a0032c8a4f132f361e6384b02ac5 (patch)
tree814d0ca80b95f50e040d86de817975c2b135a4e4
parent942ed972328270ab90818e99318ca1cec5097e3d (diff)
downloademacs-config-7a2d6c1165c4a0032c8a4f132f361e6384b02ac5.tar.gz
emacs-config-7a2d6c1165c4a0032c8a4f132f361e6384b02ac5.zip
Simplify .gitlab-ci.yml by moving DEPS to Makefile
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--GNUmakefile4
2 files changed, 7 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fedf7b..795dffd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,11 +12,11 @@ test-oni-alert:
test-oni-bookmark:
stage: test
- script: make test-oni-bookmark DEPS="oni-data-dir"
+ script: make test-oni-bookmark
test-oni-css:
stage: test
- script: make test-oni-css DEPS="oni-company oni-fci"
+ script: make test-oni-css
test-oni-grep:
stage: test
@@ -28,7 +28,7 @@ test-oni-highlight-indent-guides:
test-oni-php:
stage: test
- script: make test-oni-php DEPS="oni-flycheck oni-company oni-fci"
+ script: make test-oni-php
package-oni-conf:
stage: pre-package-multifile
diff --git a/GNUmakefile b/GNUmakefile
index 909ce87..7503828 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -33,5 +33,9 @@ test-%: install-%
--eval "(setq ert-batch-backtrace-right-margin nil)" \
--funcall ert-run-tests-batch-and-exit
+test-oni-css: DEPS := oni-company oni-fci
+test-oni-bookmark: DEPS := oni-data-dir
+test-oni-php: DEPS := oni-flycheck oni-company oni-fci
+
clean:
rm -fv $(FILES)