Skip to content

Commit

Permalink
build: use generic wildcard on package install
Browse files Browse the repository at this point in the history
To reduce TARNAME hardcoding.
  • Loading branch information
kmk3 committed Feb 29, 2024
1 parent df2dbec commit 48db047
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ build_ubuntu_package:
- ./ci/printenv.sh
- ./configure || (cat config.log; exit 1)
- make deb
- dpkg -i firejail*.deb
- dpkg -i ./*.deb
- command -V firejail && firejail --version

build_debian_package:
Expand All @@ -37,7 +37,7 @@ build_debian_package:
- ./ci/printenv.sh
- ./configure || (cat config.log; exit 1)
- make deb
- dpkg -i firejail*.deb
- dpkg -i ./*.deb
- command -V firejail && firejail --version

build_redhat_package:
Expand All @@ -49,7 +49,7 @@ build_redhat_package:
- ./ci/printenv.sh
- ./configure || (cat config.log; exit 1)
- make rpms
- rpm -i firejail*.rpm
- rpm -i ./*.rpm
- command -V firejail && firejail --version

build_fedora_package:
Expand All @@ -61,7 +61,7 @@ build_fedora_package:
- ./ci/printenv.sh
- ./configure || (cat config.log; exit 1)
- make rpms
- rpm -i firejail*.rpm
- rpm -i ./*.rpm
- command -V firejail && firejail --version

build_src_package:
Expand Down Expand Up @@ -92,7 +92,7 @@ build_no_apparmor:
- ./configure || (cat config.log; exit 1)
- make dist
- ./mkdeb.sh --disable-apparmor
- dpkg -i firejail*.deb
- dpkg -i ./*.deb
- command -V firejail && firejail --version
- firejail --version | grep -F 'AppArmor support is disabled'

Expand Down
2 changes: 1 addition & 1 deletion contrib/update_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sed -i "s/# restricted-network .*/restricted-network yes/" \
etc/firejail.config

make deb
sudo dpkg -i firejail*.deb
sudo dpkg -i ./*.deb
echo "Firejail updated."
cd ..
rm -rf firejail

0 comments on commit 48db047

Please sign in to comment.