diff options
author | netblue30 <netblue30@protonmail.com> | 2023-02-17 09:16:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-17 09:16:56 -0500 |
commit | 6dd9bdfd340dcb34793400eef43b108cc0db467d (patch) | |
tree | ac1c63a41086ffa03323ed9f70918a4aa876fe9c /.gitlab-ci.yml | |
parent | merges, testing, private-etc (diff) | |
parent | build: deb: enable apparmor by default & remove deb-apparmor (diff) | |
download | firejail-6dd9bdfd340dcb34793400eef43b108cc0db467d.tar.gz firejail-6dd9bdfd340dcb34793400eef43b108cc0db467d.tar.zst firejail-6dd9bdfd340dcb34793400eef43b108cc0db467d.zip |
Merge pull request #5668 from kmk3/build-deb-apparmor-default
build: deb: enable apparmor by default & remove deb-apparmor
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af590e2e1..6dcb40e67 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -9,8 +9,8 @@ build_ubuntu_package: | |||
9 | image: ubuntu:rolling | 9 | image: ubuntu:rolling |
10 | script: | 10 | script: |
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 libapparmor-dev pkg-config python3 gawk |
13 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 13 | - ./configure && make deb && dpkg -i firejail*.deb |
14 | - command -V firejail && firejail --version | 14 | - command -V firejail && firejail --version |
15 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | 15 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc |
16 | 16 | ||
@@ -18,8 +18,8 @@ build_debian_package: | |||
18 | image: debian:stretch | 18 | image: debian:stretch |
19 | script: | 19 | script: |
20 | - apt-get update -qq | 20 | - apt-get update -qq |
21 | - apt-get install -y -qq build-essential lintian pkg-config gawk | 21 | - apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk |
22 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 22 | - ./configure && make deb && dpkg -i firejail*.deb |
23 | - command -V firejail && firejail --version | 23 | - command -V firejail && firejail --version |
24 | 24 | ||
25 | build_redhat_package: | 25 | build_redhat_package: |
@@ -49,14 +49,14 @@ build_src_package: | |||
49 | - command -V firejail && firejail --version | 49 | - command -V firejail && firejail --version |
50 | # - python3 contrib/sort.py etc/*.{profile,inc} | 50 | # - python3 contrib/sort.py etc/*.{profile,inc} |
51 | 51 | ||
52 | build_apparmor: | 52 | build_no_apparmor: |
53 | image: ubuntu:latest | 53 | image: ubuntu:latest |
54 | script: | 54 | script: |
55 | - apt-get update -qq | 55 | - apt-get update -qq |
56 | - 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 pkg-config gawk |
57 | - ./configure && make deb-apparmor && dpkg -i firejail*.deb | 57 | - ./configure && make dist && ./mkdeb.sh --disable-apparmor && dpkg -i firejail*.deb |
58 | - command -V firejail && firejail --version | 58 | - command -V firejail && firejail --version |
59 | - firejail --version | grep -F 'AppArmor support is enabled' | 59 | - firejail --version | grep -F 'AppArmor support is disabled' |
60 | 60 | ||
61 | debian_ci: | 61 | debian_ci: |
62 | 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 |