diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-18 16:27:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-18 16:27:23 +0000 |
commit | 12fa2bee0b4131bcecba05fbf70908842a969a42 (patch) | |
tree | f7b2924c75d026828fd98c82d900cd7e9990c775 | |
parent | ci: fix --version not printing compile-time features (diff) | |
parent | gitlab-ci: actually link libapparmor on build_apparmor (diff) | |
download | firejail-12fa2bee0b4131bcecba05fbf70908842a969a42.tar.gz firejail-12fa2bee0b4131bcecba05fbf70908842a969a42.tar.zst firejail-12fa2bee0b4131bcecba05fbf70908842a969a42.zip |
Merge pull request #5148 from kmk3/ci-fix-build-apparmor
ci: print version after install & fix apparmor support on build_apparmor
-rw-r--r-- | .github/workflows/build-extra.yml | 4 | ||||
-rw-r--r-- | .github/workflows/build.yml | 2 | ||||
-rw-r--r-- | .gitlab-ci.yml | 9 |
3 files changed, 14 insertions, 1 deletions
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: | |||
35 | run: CC=clang-11 ./configure --enable-fatal-warnings | 35 | run: CC=clang-11 ./configure --enable-fatal-warnings |
36 | - name: make | 36 | - name: make |
37 | run: make | 37 | run: make |
38 | - name: make install | ||
39 | run: sudo make install | ||
40 | - name: print version | ||
41 | run: command -V firejail && firejail --version | ||
38 | scan-build: | 42 | scan-build: |
39 | runs-on: ubuntu-20.04 | 43 | runs-on: ubuntu-20.04 |
40 | steps: | 44 | 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: | |||
33 | run: make | 33 | run: make |
34 | - name: make install | 34 | - name: make install |
35 | run: sudo make install | 35 | run: sudo make install |
36 | - name: print version | ||
37 | run: command -V firejail && firejail --version | ||
36 | - name: run tests | 38 | - name: run tests |
37 | run: SHELL=/bin/bash make test-github | 39 | run: SHELL=/bin/bash make test-github |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e79028c4f..4871ef031 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -11,6 +11,7 @@ build_ubuntu_package: | |||
11 | - apt-get update -qq | 11 | - apt-get update -qq |
12 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk | 12 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk |
13 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 13 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb |
14 | - command -V firejail && firejail --version | ||
14 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | 15 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc |
15 | 16 | ||
16 | build_debian_package: | 17 | build_debian_package: |
@@ -19,6 +20,7 @@ build_debian_package: | |||
19 | - apt-get update -qq | 20 | - apt-get update -qq |
20 | - apt-get install -y -qq build-essential lintian pkg-config gawk | 21 | - apt-get install -y -qq build-essential lintian pkg-config gawk |
21 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 22 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb |
23 | - command -V firejail && firejail --version | ||
22 | 24 | ||
23 | build_redhat_package: | 25 | build_redhat_package: |
24 | image: almalinux:latest | 26 | image: almalinux:latest |
@@ -26,6 +28,7 @@ build_redhat_package: | |||
26 | - dnf update -y | 28 | - dnf update -y |
27 | - dnf install -y rpm-build gcc make | 29 | - dnf install -y rpm-build gcc make |
28 | - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm | 30 | - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm |
31 | - command -V firejail && firejail --version | ||
29 | 32 | ||
30 | build_fedora_package: | 33 | build_fedora_package: |
31 | image: fedora:latest | 34 | image: fedora:latest |
@@ -33,6 +36,7 @@ build_fedora_package: | |||
33 | - dnf update -y | 36 | - dnf update -y |
34 | - dnf install -y rpm-build gcc make | 37 | - dnf install -y rpm-build gcc make |
35 | - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm | 38 | - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm |
39 | - command -V firejail && firejail --version | ||
36 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | 40 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc |
37 | 41 | ||
38 | build_src_package: | 42 | build_src_package: |
@@ -42,6 +46,7 @@ build_src_package: | |||
42 | - apk upgrade | 46 | - apk upgrade |
43 | - apk add build-base linux-headers python3 gawk | 47 | - apk add build-base linux-headers python3 gawk |
44 | - ./configure --prefix=/usr && make && make install-strip | 48 | - ./configure --prefix=/usr && make && make install-strip |
49 | - command -V firejail && firejail --version | ||
45 | # - python3 contrib/sort.py etc/*.{profile,inc} | 50 | # - python3 contrib/sort.py etc/*.{profile,inc} |
46 | 51 | ||
47 | build_apparmor: | 52 | build_apparmor: |
@@ -49,7 +54,9 @@ build_apparmor: | |||
49 | script: | 54 | script: |
50 | - apt-get update -qq | 55 | - apt-get update -qq |
51 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk | 56 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk |
52 | - ./configure --prefix=/usr && make deb-apparmor && dpkg -i firejail*.deb | 57 | - ./configure --prefix=/usr --enable-apparmor && make deb-apparmor && dpkg -i firejail*.deb |
58 | - command -V firejail && firejail --version | ||
59 | - firejail --version | grep -F 'AppArmor support is enabled' | ||
53 | 60 | ||
54 | debian_ci: | 61 | debian_ci: |
55 | image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest | 62 | image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest |