diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 647990474ad83ed5f803ba0f7b0a83080cc71a0a..803924b13f18b08d12d643befbf3848eca1af4d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,6 @@ build_Arch_Linux_package: - "chown -R non_root:non_root /home/non_root" script: # makepkg does not run as root, but it needs sudo to install dependencies - - "cat /etc/issue" - "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) diff --git a/Makefile b/Makefile index 13e8a63b0323da31acac27213b8eaefa5f175e74..740c983f817dfaeb79bd12ae562ed4e5e448610c 100644 --- a/Makefile +++ b/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)