.gitlab-ci.yml

@@ -49,15 +49,15 @@ build_Arch_Linux_package:
     - "pacman -Suy base-devel --noconfirm"
     - "useradd non_root"
     - "echo 'non_root ALL=NOPASSWD: ALL' >> /etc/sudoers"
-    - "mkdir /home/non_root"
-    - "cp -r Makefile ArchLinux/ /home/non_root"
+    - "mkdir -p /home/non_root/build"
+    - "cp -r . /home/non_root/build"
     - "chown -R non_root:non_root /home/non_root"
   script:
     # makepkg does not run as root, but it needs sudo to install dependencies
-    - "cd /home/non_root && sudo -u non_root make package_arch"
-    - "cd /home/non_root && pacman -U ArchLinux/*tar.zst --noconfirm"
+    - "cd /home/non_root/build && sudo -u non_root make package_arch"
+    - "cd /home/non_root/build && pacman -U ArchLinux/*tar.zst --noconfirm"
     # artifacts must be relative to the working directory (e.g. /builds/leap/bitmask-vpn)
-    - "cp /home/non_root/ArchLinux/*.tar.zst $CI_PROJECT_DIR"
+    - "cp /home/non_root/build/ArchLinux/*.tar.zst $CI_PROJECT_DIR"
   artifacts:
     paths:
       - '*.tar.zst'

ArchLinux/PKGBUILD

@@ -9,7 +9,8 @@ license=("GPL-3.0-only")
 url="https://0xacab.org/leap/bitmask-vpn"
 conflicts=('riseup-vpn' 'riseup-vpn-git')
 
-source=("git+$url.git")
+#source=("git+$url.git")
+source=("bitmask-vpn::git+file://$(pwd)/../")
 sha256sums=('SKIP')
 
 # qt6-tools has /usr/lib/qt6/bin/lrelease

Makefile

@@ -444,7 +444,7 @@ package_deb:
 	@${MAKE} -C build/${PROVIDER} pkg_deb
 
 package_arch:
-	grep -q "Arch Linux" /etc/issue || (echo "Arch Linux system is required to build the Arch Linux package" && exit 1)
+	grep -q "Arch Linux" /etc/os-release || (echo "Arch Linux system is required to build the Arch Linux package" && exit 1)
 	# at least the makepkg binary is mandatory, makepkg is part pacman package
 	(cd ArchLinux && makepkg --syncdeps --noconfirm)