Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2020-07-30 10:00:37 +0300
committernl6720 <nl6720@gmail.com>2020-07-30 13:09:53 +0300
commitd7fc56e0066fc0bdfd1d45e4e67f53b218609897 (patch)
treefcce1501db07347223d615ec9d5fa66c7f904e1b
parenta96330699f6a45de80138a84e7029fd56fbcc78d (diff)
Move shell script linting into a separate make target
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.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--Makefile6
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d85b887..e5a4e03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,4 +10,4 @@ default:
lint:
stage: build
script:
- - make check
+ - make lint
diff --git a/Makefile b/Makefile
index ff43376..573d044 100644
--- 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