From 6a89ab0236ba08b7ea85fc113fa4be995918877f Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Mon, 16 May 2022 18:49:26 -0300 Subject: ci: run firejail --version after build/install To ensure that the resulting program actually runs and also to show which compile-time features it supports. --- .github/workflows/build-extra.yml | 4 ++++ .github/workflows/build.yml | 2 ++ .gitlab-ci.yml | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index 27f11459c..6f9a4bc2c 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml @@ -35,6 +35,10 @@ jobs: run: CC=clang-11 ./configure --enable-fatal-warnings - name: make run: make + - name: make install + run: sudo make install + - name: print version + run: command -V firejail && firejail --version scan-build: runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index faea6970f..cc7893305 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,5 +33,7 @@ jobs: run: make - name: make install run: sudo make install + - name: print version + run: command -V firejail && firejail --version - name: run tests run: SHELL=/bin/bash make test-github diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e79028c4f..b65411545 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ build_ubuntu_package: - apt-get update -qq - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb + - command -V firejail && firejail --version - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc build_debian_package: @@ -19,6 +20,7 @@ build_debian_package: - apt-get update -qq - apt-get install -y -qq build-essential lintian pkg-config gawk - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb + - command -V firejail && firejail --version build_redhat_package: image: almalinux:latest @@ -26,6 +28,7 @@ build_redhat_package: - dnf update -y - dnf install -y rpm-build gcc make - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm + - command -V firejail && firejail --version build_fedora_package: image: fedora:latest @@ -33,6 +36,7 @@ build_fedora_package: - dnf update -y - dnf install -y rpm-build gcc make - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm + - command -V firejail && firejail --version - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc build_src_package: @@ -42,6 +46,7 @@ build_src_package: - apk upgrade - apk add build-base linux-headers python3 gawk - ./configure --prefix=/usr && make && make install-strip + - command -V firejail && firejail --version # - python3 contrib/sort.py etc/*.{profile,inc} build_apparmor: @@ -50,6 +55,7 @@ build_apparmor: - apt-get update -qq - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk - ./configure --prefix=/usr && make deb-apparmor && dpkg -i firejail*.deb + - command -V firejail && firejail --version debian_ci: image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest -- cgit v1.2.3-54-g00ecf