Skip to content
Snippets Groups Projects
Commit be8fa973 authored by Pea Nut's avatar Pea Nut Committed by jkito
Browse files

[makefile] Fix failing check to verify we're on Arch

Use /etc/os-release instead of /etc/issue in the Makefile, see:
!271 (comment 1232050)
parent a75bc61e
No related branches found
No related tags found
1 merge request!280[CI] Use current working directory when building Arch Linux package
Pipeline #262763 passed
...@@ -54,7 +54,6 @@ build_Arch_Linux_package: ...@@ -54,7 +54,6 @@ build_Arch_Linux_package:
- "chown -R non_root:non_root /home/non_root" - "chown -R non_root:non_root /home/non_root"
script: script:
# makepkg does not run as root, but it needs sudo to install dependencies # 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 && sudo -u non_root make package_arch"
- "cd /home/non_root/build && pacman -U ArchLinux/*tar.zst --noconfirm" - "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) # artifacts must be relative to the working directory (e.g. /builds/leap/bitmask-vpn)
......
...@@ -444,7 +444,7 @@ package_deb: ...@@ -444,7 +444,7 @@ package_deb:
@${MAKE} -C build/${PROVIDER} pkg_deb @${MAKE} -C build/${PROVIDER} pkg_deb
package_arch: 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 # at least the makepkg binary is mandatory, makepkg is part pacman package
(cd ArchLinux && makepkg --syncdeps --noconfirm) (cd ArchLinux && makepkg --syncdeps --noconfirm)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment