OSDN Git Service

Move shell script linting into a separate make target
authornl6720 <nl6720@gmail.com>
Thu, 30 Jul 2020 07:00:37 +0000 (10:00 +0300)
committernl6720 <nl6720@gmail.com>
Thu, 30 Jul 2020 10:09:53 +0000 (13:09 +0300)
Makefile:
Move shellcheck to a "lint" target and change "check" so that it runs "lint".
This provides a more finer grained control and allows to extend "check" with things beyond just linting.

.gitlab-ci.yml:
Run `make lint` in the lint job.

.gitlab-ci.yml
Makefile

index d85b887..e5a4e03 100644 (file)
@@ -10,4 +10,4 @@ default:
 lint:
   stage: build
   script:
-    - make check
+    - make lint
index ff43376..573d044 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,9 @@ DOC_DIR=$(DESTDIR)/usr/share/doc/archiso
 
 all:
 
-check:
+check: lint
+
+lint:
        shellcheck -s bash archiso/mkarchiso \
                           scripts/run_archiso.sh \
                           $(INSTALL_FILES) \
@@ -44,4 +46,4 @@ install-examples:
 install-doc:
        install -vDm 644 $(DOC_FILES) -t $(DOC_DIR)
 
-.PHONY: check install install-program install-initcpio install-examples install-doc
+.PHONY: check install install-program install-initcpio install-examples install-doc lint