diff options
-rw-r--r-- | .github/workflows/build-extra.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build.yml | 4 | ||||
-rw-r--r-- | .github/workflows/test.yml | 20 | ||||
-rw-r--r-- | .gitlab-ci.yml | 14 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rwxr-xr-x | gcov.sh | 2 |
6 files changed, 25 insertions, 21 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index 918c879ad..0d9ae98ad 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml | |||
@@ -73,4 +73,4 @@ jobs: | |||
73 | - name: make install | 73 | - name: make install |
74 | run: sudo make install | 74 | run: sudo make install |
75 | - name: print version | 75 | - name: print version |
76 | run: command -V firejail && firejail --version | 76 | run: make print-version |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df706c898..4880c31e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
@@ -87,5 +87,5 @@ jobs: | |||
87 | run: make | 87 | run: make |
88 | - name: make install | 88 | - name: make install |
89 | run: sudo make install | 89 | run: sudo make install |
90 | - name: print firejail version | 90 | - name: print version |
91 | run: command -V firejail && firejail --version | 91 | run: make print-version |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c76401022..3e7153c46 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml | |||
@@ -80,8 +80,8 @@ jobs: | |||
80 | run: make -j "$(nproc)" | 80 | run: make -j "$(nproc)" |
81 | - name: make install | 81 | - name: make install |
82 | run: sudo make install | 82 | run: sudo make install |
83 | - name: print firejail version | 83 | - name: print version |
84 | run: command -V firejail && firejail --version | 84 | run: make print-version |
85 | - run: make lab-setup | 85 | - run: make lab-setup |
86 | - run: make test-seccomp-extra | 86 | - run: make test-seccomp-extra |
87 | - run: make test-firecfg | 87 | - run: make test-firecfg |
@@ -128,8 +128,8 @@ jobs: | |||
128 | run: make -j "$(nproc)" | 128 | run: make -j "$(nproc)" |
129 | - name: make install | 129 | - name: make install |
130 | run: sudo make install | 130 | run: sudo make install |
131 | - name: print firejail version | 131 | - name: print version |
132 | run: command -V firejail && firejail --version | 132 | run: make print-version |
133 | - run: make lab-setup | 133 | - run: make lab-setup |
134 | - run: make test-private-etc | 134 | - run: make test-private-etc |
135 | - run: make test-fs | 135 | - run: make test-fs |
@@ -167,8 +167,8 @@ jobs: | |||
167 | run: make -j "$(nproc)" | 167 | run: make -j "$(nproc)" |
168 | - name: make install | 168 | - name: make install |
169 | run: sudo make install | 169 | run: sudo make install |
170 | - name: print firejail version | 170 | - name: print version |
171 | run: command -V firejail && firejail --version | 171 | run: make print-version |
172 | - run: make lab-setup | 172 | - run: make lab-setup |
173 | - run: make test-environment | 173 | - run: make test-environment |
174 | - run: make test-profiles | 174 | - run: make test-profiles |
@@ -209,8 +209,8 @@ jobs: | |||
209 | run: make -j "$(nproc)" | 209 | run: make -j "$(nproc)" |
210 | - name: make install | 210 | - name: make install |
211 | run: sudo make install | 211 | run: sudo make install |
212 | - name: print firejail version | 212 | - name: print version |
213 | run: command -V firejail && firejail --version | 213 | run: make print-version |
214 | - run: make lab-setup | 214 | - run: make lab-setup |
215 | - run: make test-utils | 215 | - run: make test-utils |
216 | 216 | ||
@@ -255,8 +255,8 @@ jobs: | |||
255 | run: make -j "$(nproc)" | 255 | run: make -j "$(nproc)" |
256 | - name: make install | 256 | - name: make install |
257 | run: sudo make install | 257 | run: sudo make install |
258 | - name: print firejail version | 258 | - name: print version |
259 | run: command -V firejail && firejail --version | 259 | run: make print-version |
260 | - run: make lab-setup | 260 | - run: make lab-setup |
261 | - run: make test-fnetfilter | 261 | - run: make test-fnetfilter |
262 | - run: make test-sysutils | 262 | - run: make test-sysutils |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9f196ce4..8f6669203 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -21,7 +21,7 @@ build_ubuntu_package: | |||
21 | - ./configure || (cat config.log; exit 1) | 21 | - ./configure || (cat config.log; exit 1) |
22 | - make deb | 22 | - make deb |
23 | - dpkg -i ./*.deb | 23 | - dpkg -i ./*.deb |
24 | - command -V firejail && firejail --version | 24 | - make print-version |
25 | 25 | ||
26 | build_debian_package: | 26 | build_debian_package: |
27 | image: debian:buster | 27 | image: debian:buster |
@@ -38,7 +38,7 @@ build_debian_package: | |||
38 | - ./configure || (cat config.log; exit 1) | 38 | - ./configure || (cat config.log; exit 1) |
39 | - make deb | 39 | - make deb |
40 | - dpkg -i ./*.deb | 40 | - dpkg -i ./*.deb |
41 | - command -V firejail && firejail --version | 41 | - make print-version |
42 | 42 | ||
43 | build_redhat_package: | 43 | build_redhat_package: |
44 | image: almalinux:latest | 44 | image: almalinux:latest |
@@ -50,7 +50,7 @@ build_redhat_package: | |||
50 | - ./configure || (cat config.log; exit 1) | 50 | - ./configure || (cat config.log; exit 1) |
51 | - make rpms | 51 | - make rpms |
52 | - rpm -i ./*.rpm | 52 | - rpm -i ./*.rpm |
53 | - command -V firejail && firejail --version | 53 | - make print-version |
54 | 54 | ||
55 | build_fedora_package: | 55 | build_fedora_package: |
56 | image: fedora:latest | 56 | image: fedora:latest |
@@ -62,7 +62,7 @@ build_fedora_package: | |||
62 | - ./configure || (cat config.log; exit 1) | 62 | - ./configure || (cat config.log; exit 1) |
63 | - make rpms | 63 | - make rpms |
64 | - rpm -i ./*.rpm | 64 | - rpm -i ./*.rpm |
65 | - command -V firejail && firejail --version | 65 | - make print-version |
66 | 66 | ||
67 | build_src_package: | 67 | build_src_package: |
68 | image: alpine:latest | 68 | image: alpine:latest |
@@ -75,7 +75,7 @@ build_src_package: | |||
75 | - ./configure --prefix=/usr || (cat config.log; exit 1) | 75 | - ./configure --prefix=/usr || (cat config.log; exit 1) |
76 | - make | 76 | - make |
77 | - make install-strip | 77 | - make install-strip |
78 | - command -V firejail && firejail --version | 78 | - make print-version |
79 | 79 | ||
80 | build_no_apparmor: | 80 | build_no_apparmor: |
81 | image: ubuntu:latest | 81 | image: ubuntu:latest |
@@ -93,8 +93,8 @@ build_no_apparmor: | |||
93 | - make dist | 93 | - make dist |
94 | - ./mkdeb.sh --disable-apparmor | 94 | - ./mkdeb.sh --disable-apparmor |
95 | - dpkg -i ./*.deb | 95 | - dpkg -i ./*.deb |
96 | - command -V firejail && firejail --version | 96 | - make print-version |
97 | - firejail --version | grep -F 'AppArmor support is disabled' | 97 | - make print-version | grep -F 'AppArmor support is disabled' |
98 | 98 | ||
99 | debian_ci: | 99 | debian_ci: |
100 | image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest | 100 | image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest |
@@ -391,6 +391,10 @@ codespell: | |||
391 | print-env: | 391 | print-env: |
392 | ./ci/printenv.sh | 392 | ./ci/printenv.sh |
393 | 393 | ||
394 | .PHONY: print-version | ||
395 | print-version: config.mk | ||
396 | command -V $(TARNAME) && $(TARNAME) --version | ||
397 | |||
394 | # | 398 | # |
395 | # make test | 399 | # make test |
396 | # | 400 | # |
@@ -19,7 +19,7 @@ gcov_generate() { | |||
19 | 19 | ||
20 | make distclean && ./configure --prefix=/usr --enable-apparmor --enable-gcov --enable-fatal-warnings && make -j4 && sudo make install | 20 | make distclean && ./configure --prefix=/usr --enable-apparmor --enable-gcov --enable-fatal-warnings && make -j4 && sudo make install |
21 | rm -fr gcov-dir gcov-file | 21 | rm -fr gcov-dir gcov-file |
22 | firejail --version | 22 | make print-version |
23 | gcov_generate | 23 | gcov_generate |
24 | 24 | ||
25 | make test-firecfg | grep TESTING | 25 | make test-firecfg | grep TESTING |