Merge pull request #5148 from kmk3/ci-fix-build-apparmor

ci: print version after install & fix apparmor support on build_apparmor
netblue30 · May 18, 2022 · 12fa2be · 12fa2be
2 parents 78aaed1 + 1f671ab
commit 12fa2be
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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,20 +20,23 @@ 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
     script:
         - 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
     script:
         - 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,14 +46,17 @@ 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:
     image: ubuntu:latest
     script:
         - 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
+        - ./configure --prefix=/usr --enable-apparmor && make deb-apparmor && dpkg -i firejail*.deb
+        - command -V firejail && firejail --version
+        - firejail --version | grep -F 'AppArmor support is enabled'
 
 debian_ci:
     image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest