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-16 14:40:27 +0300
committernl6720 <nl6720@gmail.com>2020-07-17 10:42:14 +0300
commitecd339278d767b9ff174964df4a75deb3e2788b0 (patch)
tree9e9b11515376570e59a58161af4d594bdc11caac
parent6f0a15c34ad35af61fe047331a909fbd0cad62e5 (diff)
Add check target to Makefile
Makefile: Move shellcheck commands from .gitlab-ci.yml. .gitlab-ci.yml: Run `make check`. Prevent partial upgrades, i.e. use '-Syu'. Prevent reinstalling already installed packages by using pacman's '--needed' option. Don't force-download the package database.
-rw-r--r--.gitlab-ci.yml14
-rw-r--r--Makefile11
2 files changed, 12 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74ecdd3..e69ab5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,19 +3,9 @@
default:
image: archlinux/base
before_script:
- - pacman --noconfirm -Syy
- - pacman --noconfirm -S base-devel shellcheck
+ - pacman --noconfirm -Syu --needed base-devel shellcheck
lint:
stage: build
script:
- - shellcheck -s bash
- archiso/mkarchiso
- configs/{baseline,releng}/build.sh
- configs/releng/airootfs/root/.automated_script.sh
- configs/releng/airootfs/usr/local/bin/choose-mirror
- scripts/run_archiso.sh
- archiso/initcpio/install/*
- - shellcheck -s dash
- archiso/initcpio/hooks/*
- archiso/initcpio/script/*
+ - make check
diff --git a/Makefile b/Makefile
index 6b479f9..3ee8a6a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,15 @@ DOC_DIR=$(DESTDIR)/usr/share/doc/archiso
all:
+check:
+ shellcheck -s bash archiso/mkarchiso \
+ scripts/run_archiso.sh \
+ $(INSTALL_FILES) \
+ $(wildcard configs/*/build.sh) \
+ configs/releng/airootfs/root/.automated_script.sh \
+ configs/releng/airootfs/usr/local/bin/choose-mirror
+ shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES)
+
install: install-program install-initcpio install-examples install-doc
install-program:
@@ -32,4 +41,4 @@ install-doc:
install -d $(DOC_DIR)
install -m 644 -t $(DOC_DIR) $(DOC_FILES)
-.PHONY: install install-program install-initcpio install-examples install-doc
+.PHONY: check install install-program install-initcpio install-examples install-doc