Merge branch 'master' into extended-options

2 files changed, 18 insertions, 7 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 982c844..8b29b77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,14 @@ stages:
   - build
 
 before_script:
-  - apt-get -qq update
-  - apt-get install -y git debhelper dpkg-dev build-essential fakeroot flawfinder wget unzip
-  - apt-get install -y libpcap-dev libselinux1-dev
-  - apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64 mingw-w64-i686-dev mingw-w64-common clang
-  - apt-get install -y autoconf automake dh-autoreconf
+  - test ! -r /etc/debian_version || apt-get -qq update
+  - test ! -r /etc/debian_version || apt-get install -y git debhelper dpkg-dev build-essential fakeroot flawfinder wget unzip
+  - test ! -r /etc/debian_version || apt-get install -y libpcap-dev libselinux1-dev
+  - test ! -r /etc/debian_version || apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64 mingw-w64-i686-dev mingw-w64-common clang
+  - test ! -r /etc/debian_version || apt-get install -y autoconf automake dh-autoreconf
+  - test ! -r /etc/arch-release || pacman -Sy archlinux-keyring --noconfirm
+  - test ! -r /etc/arch-release || pacman -Syu --noconfirm
+  - test ! -r /etc/arch-release || pacman -S --noconfirm binutils gcc base-devel git
 
 build:
   script:
@@ -31,6 +34,16 @@ build-debian:
       - config.log
     when: always
 
+build-archlinux:
+  image: finalduty/archlinux:daily
+  script:
+    - useradd builduser -m
+    - passwd -d builduser
+    - chown -R builduser .
+    - su -m builduser bash -c 'makepkg'
+    - su -m builduser bash -c 'makepkg -p PKGBUILD.dev --skipchecksums'
+  stage: build
+
 build-mingw:
   script:
     - autoreconf -fi
diff --git a/PKGBUILD b/PKGBUILD
index d9001af..5279f40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,6 +25,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 	find "${pkgdir}" -type d -name .git -exec rm -r '{}' +
 	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ptunnel-ng/LICENSE"
-	install -D -m644 contrib/ptunnel-ng.conf "${pkgdir}/etc/conf.d/ptunnel-ng"
-	install -D -m644 contrib/ptunnel-ng.service "${pkgdir}/etc/systemd/system/ptunnel-ng.service"
 }