diff options
-rw-r--r-- | .github/workflows/build-extra.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build.yml | 1 | ||||
-rw-r--r-- | .gitlab-ci.yml | 12 |
3 files changed, 9 insertions, 6 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index c812e4572..32a8969d6 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml | |||
@@ -71,6 +71,7 @@ jobs: | |||
71 | run: > | 71 | run: > |
72 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor | 72 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor |
73 | --enable-selinux | 73 | --enable-selinux |
74 | || (cat config.log; exit 1) | ||
74 | - name: make | 75 | - name: make |
75 | run: make | 76 | run: make |
76 | - name: make install | 77 | - name: make install |
@@ -98,6 +99,7 @@ jobs: | |||
98 | run: > | 99 | run: > |
99 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor | 100 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor |
100 | --enable-selinux | 101 | --enable-selinux |
102 | || (cat config.log; exit 1) | ||
101 | - name: scan-build | 103 | - name: scan-build |
102 | run: NO_EXTRA_CFLAGS="yes" scan-build-14 --status-bugs make | 104 | run: NO_EXTRA_CFLAGS="yes" scan-build-14 --status-bugs make |
103 | cppcheck: | 105 | cppcheck: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e896ba8e0..82ec9b5bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
@@ -75,6 +75,7 @@ jobs: | |||
75 | run: > | 75 | run: > |
76 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings | 76 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings |
77 | --enable-analyzer --enable-apparmor --enable-selinux | 77 | --enable-analyzer --enable-apparmor --enable-selinux |
78 | || (cat config.log; exit 1) | ||
78 | - name: make | 79 | - name: make |
79 | run: make | 80 | run: make |
80 | - name: make install | 81 | - name: make install |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38d121c49..5befc6f4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -14,7 +14,7 @@ build_ubuntu_package: | |||
14 | DEBIAN_FRONTEND=noninteractive apt-get install -y -qq | 14 | DEBIAN_FRONTEND=noninteractive apt-get install -y -qq |
15 | build-essential lintian libapparmor-dev pkg-config python3 gawk | 15 | build-essential lintian libapparmor-dev pkg-config python3 gawk |
16 | - ./ci/printenv.sh | 16 | - ./ci/printenv.sh |
17 | - ./configure | 17 | - ./configure || (cat config.log; exit 1) |
18 | - make deb | 18 | - make deb |
19 | - dpkg -i firejail*.deb | 19 | - dpkg -i firejail*.deb |
20 | - command -V firejail && firejail --version | 20 | - command -V firejail && firejail --version |
@@ -29,7 +29,7 @@ build_debian_package: | |||
29 | apt-get install -y -qq | 29 | apt-get install -y -qq |
30 | build-essential lintian libapparmor-dev pkg-config gawk | 30 | build-essential lintian libapparmor-dev pkg-config gawk |
31 | - ./ci/printenv.sh | 31 | - ./ci/printenv.sh |
32 | - ./configure | 32 | - ./configure || (cat config.log; exit 1) |
33 | - make deb | 33 | - make deb |
34 | - dpkg -i firejail*.deb | 34 | - dpkg -i firejail*.deb |
35 | - command -V firejail && firejail --version | 35 | - command -V firejail && firejail --version |
@@ -40,7 +40,7 @@ build_redhat_package: | |||
40 | - dnf update -y | 40 | - dnf update -y |
41 | - dnf install -y rpm-build gcc make | 41 | - dnf install -y rpm-build gcc make |
42 | - ./ci/printenv.sh | 42 | - ./ci/printenv.sh |
43 | - ./configure --prefix=/usr | 43 | - ./configure --prefix=/usr || (cat config.log; exit 1) |
44 | - make rpms | 44 | - make rpms |
45 | - rpm -i firejail*.rpm | 45 | - rpm -i firejail*.rpm |
46 | - command -V firejail && firejail --version | 46 | - command -V firejail && firejail --version |
@@ -51,7 +51,7 @@ build_fedora_package: | |||
51 | - dnf update -y | 51 | - dnf update -y |
52 | - dnf install -y rpm-build gcc make | 52 | - dnf install -y rpm-build gcc make |
53 | - ./ci/printenv.sh | 53 | - ./ci/printenv.sh |
54 | - ./configure --prefix=/usr | 54 | - ./configure --prefix=/usr || (cat config.log; exit 1) |
55 | - make rpms | 55 | - make rpms |
56 | - rpm -i firejail*.rpm | 56 | - rpm -i firejail*.rpm |
57 | - command -V firejail && firejail --version | 57 | - command -V firejail && firejail --version |
@@ -65,7 +65,7 @@ build_src_package: | |||
65 | - apk upgrade | 65 | - apk upgrade |
66 | - apk add build-base linux-headers python3 gawk | 66 | - apk add build-base linux-headers python3 gawk |
67 | - ./ci/printenv.sh | 67 | - ./ci/printenv.sh |
68 | - ./configure --prefix=/usr | 68 | - ./configure --prefix=/usr || (cat config.log; exit 1) |
69 | - make | 69 | - make |
70 | - make install-strip | 70 | - make install-strip |
71 | - command -V firejail && firejail --version | 71 | - command -V firejail && firejail --version |
@@ -80,7 +80,7 @@ build_no_apparmor: | |||
80 | DEBIAN_FRONTEND=noninteractive apt-get install -y -qq | 80 | DEBIAN_FRONTEND=noninteractive apt-get install -y -qq |
81 | build-essential lintian pkg-config gawk | 81 | build-essential lintian pkg-config gawk |
82 | - ./ci/printenv.sh | 82 | - ./ci/printenv.sh |
83 | - ./configure | 83 | - ./configure || (cat config.log; exit 1) |
84 | - make dist | 84 | - make dist |
85 | - ./mkdeb.sh --disable-apparmor | 85 | - ./mkdeb.sh --disable-apparmor |
86 | - dpkg -i firejail*.deb | 86 | - dpkg -i firejail*.deb |