Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Runge <dvzrv@archlinux.org>2021-07-31 15:38:56 +0200
committerDavid Runge <dvzrv@archlinux.org>2021-07-31 15:38:56 +0200
commitbf02872fba1e2ff3673f5c2bdcebed03e0e62a81 (patch)
tree787086d75442e90e98ef3e734b2c5fc3889f1c24
parentc08f10340d50e1ec7465e00dfa7a5f9ba027b99e (diff)
parent32f1b7698fb7a5652de76d4ca00969a853fa6628 (diff)
Merge branch 'issues/3'
* issues/3: Add gitlab CI integration Makefile: Fix documentation installation path
-rw-r--r--.gitlab-ci.yml21
-rw-r--r--Makefile2
2 files changed, 22 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..24e5128
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,21 @@
+---
+
+image: archlinux:latest
+
+stages:
+ - check
+ - integration
+
+check:
+ before_script:
+ - pacman --noconfirm -Syu --needed make shellcheck shfmt
+ script:
+ - make check
+ stage: check
+
+test_installation:
+ before_script:
+ - pacman --noconfirm -Syu --needed make
+ script:
+ - make install PREFIX=/usr
+ stage: integration
diff --git a/Makefile b/Makefile
index ceea8bf..fb8ebae 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ PREFIX ?= /usr/local
INSTALL_DIR=$(DESTDIR)$(PREFIX)/lib/initcpio/install
HOOKS_DIR=$(DESTDIR)$(PREFIX)/lib/initcpio/hooks
SCRIPT_DIR=$(DESTDIR)$(PREFIX)/lib/initcpio
-DOC_DIR=$(DESTDIR)$(PREFIX)/share/doc/archiso
+DOC_DIR=$(DESTDIR)$(PREFIX)/share/doc/mkinitcpio-archiso
INSTALL_FILES=$(wildcard install/*)
HOOKS_FILES=$(wildcard hooks/*)