diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index 918c879ad5b..0d9ae98ada2 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml @@ -73,4 +73,4 @@ jobs: - name: make install run: sudo make install - name: print version - run: command -V firejail && firejail --version + run: make print-version diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df706c89884..4880c31e1b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,5 +87,5 @@ jobs: run: make - name: make install run: sudo make install - - name: print firejail version - run: command -V firejail && firejail --version + - name: print version + run: make print-version diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c7640102281..3e7153c46dd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -80,8 +80,8 @@ jobs: run: make -j "$(nproc)" - name: make install run: sudo make install - - name: print firejail version - run: command -V firejail && firejail --version + - name: print version + run: make print-version - run: make lab-setup - run: make test-seccomp-extra - run: make test-firecfg @@ -128,8 +128,8 @@ jobs: run: make -j "$(nproc)" - name: make install run: sudo make install - - name: print firejail version - run: command -V firejail && firejail --version + - name: print version + run: make print-version - run: make lab-setup - run: make test-private-etc - run: make test-fs @@ -167,8 +167,8 @@ jobs: run: make -j "$(nproc)" - name: make install run: sudo make install - - name: print firejail version - run: command -V firejail && firejail --version + - name: print version + run: make print-version - run: make lab-setup - run: make test-environment - run: make test-profiles @@ -209,8 +209,8 @@ jobs: run: make -j "$(nproc)" - name: make install run: sudo make install - - name: print firejail version - run: command -V firejail && firejail --version + - name: print version + run: make print-version - run: make lab-setup - run: make test-utils @@ -255,8 +255,8 @@ jobs: run: make -j "$(nproc)" - name: make install run: sudo make install - - name: print firejail version - run: command -V firejail && firejail --version + - name: print version + run: make print-version - run: make lab-setup - run: make test-fnetfilter - run: make test-sysutils diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9f196ce459..8f666920341 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 diff --git a/Makefile b/Makefile index dcd84b7abe7..158a3c2223a 100644 --- a/Makefile +++ b/Makefile @@ -391,6 +391,10 @@ codespell: print-env: ./ci/printenv.sh +.PHONY: print-version +print-version: config.mk + command -V $(TARNAME) && $(TARNAME) --version + # # make test # diff --git a/gcov.sh b/gcov.sh index b949731d9cf..13f8baae1a3 100755 --- a/gcov.sh +++ b/gcov.sh @@ -19,7 +19,7 @@ gcov_generate() { make distclean && ./configure --prefix=/usr --enable-apparmor --enable-gcov --enable-fatal-warnings && make -j4 && sudo make install rm -fr gcov-dir gcov-file -firejail --version +make print-version gcov_generate make test-firecfg | grep TESTING