aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build-extra.yml26
-rw-r--r--.github/workflows/build.yml5
-rw-r--r--.gitlab-ci.yml52
3 files changed, 47 insertions, 36 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml
index c812e4572..e32f827e1 100644
--- a/.github/workflows/build-extra.yml
+++ b/.github/workflows/build-extra.yml
@@ -62,15 +62,18 @@ jobs:
62 github.com:443 62 github.com:443
63 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab 63 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
64 - name: update package information 64 - name: update package information
65 run: sudo apt-get update 65 run: sudo apt-get update -qy
66 - name: install dependencies 66 - name: install dependencies
67 run: sudo apt-get install libapparmor-dev libselinux1-dev 67 run: >
68 sudo apt-get install -qy
69 libapparmor-dev libselinux1-dev
68 - name: print env 70 - name: print env
69 run: ./ci/printenv.sh 71 run: ./ci/printenv.sh
70 - name: configure 72 - name: configure
71 run: > 73 run: >
72 CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor 74 CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor
73 --enable-selinux 75 --enable-selinux
76 || (cat config.log; exit 1)
74 - name: make 77 - name: make
75 run: make 78 run: make
76 - name: make install 79 - name: make install
@@ -89,15 +92,18 @@ jobs:
89 github.com:443 92 github.com:443
90 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab 93 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
91 - name: update package information 94 - name: update package information
92 run: sudo apt-get update 95 run: sudo apt-get update -qy
93 - name: install clang-tools-14 and dependencies 96 - name: install clang-tools-14 and dependencies
94 run: sudo apt-get install clang-tools-14 libapparmor-dev libselinux1-dev 97 run: >
98 sudo apt-get install -qy
99 clang-tools-14 libapparmor-dev libselinux1-dev
95 - name: print env 100 - name: print env
96 run: ./ci/printenv.sh 101 run: ./ci/printenv.sh
97 - name: configure 102 - name: configure
98 run: > 103 run: >
99 CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor 104 CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor
100 --enable-selinux 105 --enable-selinux
106 || (cat config.log; exit 1)
101 - name: scan-build 107 - name: scan-build
102 run: NO_EXTRA_CFLAGS="yes" scan-build-14 --status-bugs make 108 run: NO_EXTRA_CFLAGS="yes" scan-build-14 --status-bugs make
103 cppcheck: 109 cppcheck:
@@ -112,9 +118,9 @@ jobs:
112 github.com:443 118 github.com:443
113 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab 119 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
114 - name: update package information 120 - name: update package information
115 run: sudo apt-get update 121 run: sudo apt-get update -qy
116 - name: install cppcheck 122 - name: install cppcheck
117 run: sudo apt-get install cppcheck 123 run: sudo apt-get install -qy cppcheck
118 - run: cppcheck --version 124 - run: cppcheck --version
119 - name: cppcheck 125 - name: cppcheck
120 run: > 126 run: >
@@ -134,9 +140,9 @@ jobs:
134 github.com:443 140 github.com:443
135 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab 141 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
136 - name: update package information 142 - name: update package information
137 run: sudo apt-get update 143 run: sudo apt-get update -qy
138 - name: install cppcheck 144 - name: install cppcheck
139 run: sudo apt-get install cppcheck 145 run: sudo apt-get install -qy cppcheck
140 - run: cppcheck --version 146 - run: cppcheck --version
141 - name: cppcheck 147 - name: cppcheck
142 run: cppcheck -q --force --error-exitcode=1 --enable=warning,performance . 148 run: cppcheck -q --force --error-exitcode=1 --enable=warning,performance .
@@ -152,9 +158,9 @@ jobs:
152 github.com:443 158 github.com:443
153 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab 159 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
154 - name: update package information 160 - name: update package information
155 run: sudo apt-get update 161 run: sudo apt-get update -qy
156 - name: install dependencies 162 - name: install dependencies
157 run: sudo apt-get install codespell 163 run: sudo apt-get install -qy codespell
158 - run: codespell --version 164 - run: codespell --version
159 - name: codespell 165 - name: codespell
160 run: make codespell 166 run: make codespell
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e896ba8e0..ea85e1109 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,10 +63,10 @@ jobs:
63 yahoo.com:1025 63 yahoo.com:1025
64 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab 64 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
65 - name: update package information 65 - name: update package information
66 run: sudo apt-get update 66 run: sudo apt-get update -qy
67 - name: install dependencies 67 - name: install dependencies
68 run: > 68 run: >
69 sudo apt-get install 69 sudo apt-get install -qy
70 gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois 70 gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois
71 bridge-utils 71 bridge-utils
72 - name: print env 72 - name: print env
@@ -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..cb88c0263 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,28 +8,32 @@
8 8
9build_ubuntu_package: 9build_ubuntu_package:
10 image: ubuntu:rolling 10 image: ubuntu:rolling
11 variables:
12 DEBIAN_FRONTEND: noninteractive
11 script: 13 script:
12 - apt-get update -qq 14 - apt-get update -qy
13 - > 15 - >
14 DEBIAN_FRONTEND=noninteractive apt-get install -y -qq 16 apt-get install --no-install-recommends -qy
15 build-essential lintian libapparmor-dev pkg-config python3 gawk 17 build-essential fakeroot lintian libapparmor-dev pkg-config gawk
18 | grep -Ev '^(Selecting|Preparing to unpack|Unpacking)'
16 - ./ci/printenv.sh 19 - ./ci/printenv.sh
17 - ./configure 20 - ./configure || (cat config.log; exit 1)
18 - make deb 21 - make deb
19 - dpkg -i firejail*.deb 22 - dpkg -i firejail*.deb
20 - command -V firejail && firejail --version 23 - command -V firejail && firejail --version
21 # - python3 --version
22 # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc
23 24
24build_debian_package: 25build_debian_package:
25 image: debian:buster 26 image: debian:buster
27 variables:
28 DEBIAN_FRONTEND: noninteractive
26 script: 29 script:
27 - apt-get update -qq 30 - apt-get update -qy
28 - > 31 - >
29 apt-get install -y -qq 32 apt-get install --no-install-recommends -qy
30 build-essential lintian libapparmor-dev pkg-config gawk 33 build-essential fakeroot lintian libapparmor-dev pkg-config gawk
34 | grep -Ev '^(Selecting|Preparing to unpack|Unpacking)'
31 - ./ci/printenv.sh 35 - ./ci/printenv.sh
32 - ./configure 36 - ./configure || (cat config.log; exit 1)
33 - make deb 37 - make deb
34 - dpkg -i firejail*.deb 38 - dpkg -i firejail*.deb
35 - command -V firejail && firejail --version 39 - command -V firejail && firejail --version
@@ -40,7 +44,7 @@ build_redhat_package:
40 - dnf update -y 44 - dnf update -y
41 - dnf install -y rpm-build gcc make 45 - dnf install -y rpm-build gcc make
42 - ./ci/printenv.sh 46 - ./ci/printenv.sh
43 - ./configure --prefix=/usr 47 - ./configure --prefix=/usr || (cat config.log; exit 1)
44 - make rpms 48 - make rpms
45 - rpm -i firejail*.rpm 49 - rpm -i firejail*.rpm
46 - command -V firejail && firejail --version 50 - command -V firejail && firejail --version
@@ -51,36 +55,35 @@ build_fedora_package:
51 - dnf update -y 55 - dnf update -y
52 - dnf install -y rpm-build gcc make 56 - dnf install -y rpm-build gcc make
53 - ./ci/printenv.sh 57 - ./ci/printenv.sh
54 - ./configure --prefix=/usr 58 - ./configure --prefix=/usr || (cat config.log; exit 1)
55 - make rpms 59 - make rpms
56 - rpm -i firejail*.rpm 60 - rpm -i firejail*.rpm
57 - command -V firejail && firejail --version 61 - command -V firejail && firejail --version
58 # - python3 --version
59 # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc
60 62
61build_src_package: 63build_src_package:
62 image: alpine:latest 64 image: alpine:latest
63 script: 65 script:
64 - apk update 66 - apk update
65 - apk upgrade 67 - apk upgrade
66 - apk add build-base linux-headers python3 gawk 68 - apk add build-base linux-headers gawk
67 - ./ci/printenv.sh 69 - ./ci/printenv.sh
68 - ./configure --prefix=/usr 70 - ./configure --prefix=/usr || (cat config.log; exit 1)
69 - make 71 - make
70 - make install-strip 72 - make install-strip
71 - command -V firejail && firejail --version 73 - command -V firejail && firejail --version
72 # - python3 --version
73 # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc
74 74
75build_no_apparmor: 75build_no_apparmor:
76 image: ubuntu:latest 76 image: ubuntu:latest
77 variables:
78 DEBIAN_FRONTEND: noninteractive
77 script: 79 script:
78 - apt-get update -qq 80 - apt-get update -qy
79 - > 81 - >
80 DEBIAN_FRONTEND=noninteractive apt-get install -y -qq 82 apt-get install --no-install-recommends -qy
81 build-essential lintian pkg-config gawk 83 build-essential fakeroot lintian pkg-config gawk
84 | grep -Ev '^(Selecting|Preparing to unpack|Unpacking)'
82 - ./ci/printenv.sh 85 - ./ci/printenv.sh
83 - ./configure 86 - ./configure || (cat config.log; exit 1)
84 - make dist 87 - make dist
85 - ./mkdeb.sh --disable-apparmor 88 - ./mkdeb.sh --disable-apparmor
86 - dpkg -i firejail*.deb 89 - dpkg -i firejail*.deb
@@ -92,6 +95,7 @@ debian_ci:
92 variables: 95 variables:
93 DEBFULLNAME: "$GITLAB_USER_NAME" 96 DEBFULLNAME: "$GITLAB_USER_NAME"
94 DEBEMAIL: "$GITLAB_USER_EMAIL" 97 DEBEMAIL: "$GITLAB_USER_EMAIL"
98 DEBIAN_FRONTEND: noninteractive
95 before_script: 99 before_script:
96 - git checkout -B ci_build "$CI_COMMIT_SHA" 100 - git checkout -B ci_build "$CI_COMMIT_SHA"
97 - gitlab-ci-enable-sid 101 - gitlab-ci-enable-sid
@@ -101,7 +105,7 @@ debian_ci:
101 deb-src http://deb.debian.org/debian sid main 105 deb-src http://deb.debian.org/debian sid main
102 deb-src http://deb.debian.org/debian experimental main 106 deb-src http://deb.debian.org/debian experimental main
103 EOF 107 EOF
104 - apt-get update 108 - apt-get update -qy
105 - git config user.name "$DEBFULLNAME" 109 - git config user.name "$DEBFULLNAME"
106 - git config user.email "$DEBEMAIL" 110 - git config user.email "$DEBEMAIL"
107 - | 111 - |
@@ -122,7 +126,7 @@ debian_ci:
122 - git commit -m 'add debian/' 126 - git commit -m 'add debian/'
123 - export CI_COMMIT_SHA="$(git rev-parse HEAD)" 127 - export CI_COMMIT_SHA="$(git rev-parse HEAD)"
124 script: 128 script:
125 - apt-get --no-install-recommends install -y -qq gawk 129 - apt-get install --no-install-recommends -qy gawk
126 - ./ci/printenv.sh 130 - ./ci/printenv.sh
127 - gitlab-ci-git-buildpackage 131 - gitlab-ci-git-buildpackage
128 - gitlab-ci-lintian 132 - gitlab-ci-lintian