From c9531d95ed3f12c382a0292e9eb508a9b9c96532 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Thu, 22 Feb 2024 10:09:26 -0300
Subject: build: add print-version target and use in CI

To reduce TARNAME hardcoding.

Added on commit 6a89ab023 ("ci: run firejail --version after
build/install", 2022-05-16) / PR #5148.
---
 .gitlab-ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9f196ce4..8f6669203 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ build_ubuntu_package:
         - ./configure || (cat config.log; exit 1)
         - make deb
         - dpkg -i ./*.deb
-        - command -V firejail && firejail --version
+        - make print-version
 
 build_debian_package:
     image: debian:buster
@@ -38,7 +38,7 @@ build_debian_package:
         - ./configure || (cat config.log; exit 1)
         - make deb
         - dpkg -i ./*.deb
-        - command -V firejail && firejail --version
+        - make print-version
 
 build_redhat_package:
     image: almalinux:latest
@@ -50,7 +50,7 @@ build_redhat_package:
         - ./configure || (cat config.log; exit 1)
         - make rpms
         - rpm -i ./*.rpm
-        - command -V firejail && firejail --version
+        - make print-version
 
 build_fedora_package:
     image: fedora:latest
@@ -62,7 +62,7 @@ build_fedora_package:
         - ./configure || (cat config.log; exit 1)
         - make rpms
         - rpm -i ./*.rpm
-        - command -V firejail && firejail --version
+        - make print-version
 
 build_src_package:
     image: alpine:latest
@@ -75,7 +75,7 @@ build_src_package:
         - ./configure --prefix=/usr || (cat config.log; exit 1)
         - make
         - make install-strip
-        - command -V firejail && firejail --version
+        - make print-version
 
 build_no_apparmor:
     image: ubuntu:latest
@@ -93,8 +93,8 @@ build_no_apparmor:
         - make dist
         - ./mkdeb.sh --disable-apparmor
         - dpkg -i ./*.deb
-        - command -V firejail && firejail --version
-        - firejail --version | grep -F 'AppArmor support is disabled'
+        - make print-version
+        - make print-version | grep -F 'AppArmor support is disabled'
 
 debian_ci:
     image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest
-- 
cgit v1.2.3-54-g00ecf