aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-02-27 02:15:07 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-02-29 08:52:25 -0300
commit99fb723317c1a9eb65c013f48b41785f125d8170 (patch)
tree4263d4be74b0331d31a0527839ad7a30aa488d77 /.gitlab-ci.yml
parentci: run check-c.yml on any C code change (diff)
downloadfirejail-99fb723317c1a9eb65c013f48b41785f125d8170.tar.gz
firejail-99fb723317c1a9eb65c013f48b41785f125d8170.tar.zst
firejail-99fb723317c1a9eb65c013f48b41785f125d8170.zip
ci: move build_no_apparmor job near other similar jobs
To make it easier to compare and edit the main apt-based jobs in .gitlab-ci.yml.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml38
1 files changed, 19 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b72dced7a..7ce1aa9ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,25 @@ build_debian_package:
40 - dpkg -i ./*.deb 40 - dpkg -i ./*.deb
41 - make print-version 41 - make print-version
42 42
43build_no_apparmor:
44 image: ubuntu:latest
45 timeout: 10 minutes
46 variables:
47 DEBIAN_FRONTEND: noninteractive
48 script:
49 - apt-get update -qy
50 - >
51 apt-get install --no-install-recommends -qy
52 build-essential fakeroot lintian pkg-config gawk
53 | grep -Ev '^(Selecting|Preparing to unpack|Unpacking)'
54 - ./ci/printenv.sh
55 - ./configure || (cat config.log; exit 1)
56 - make dist
57 - ./mkdeb.sh --disable-apparmor
58 - dpkg -i ./*.deb
59 - make print-version
60 - make print-version | grep -F 'AppArmor support is disabled'
61
43build_redhat_package: 62build_redhat_package:
44 image: almalinux:latest 63 image: almalinux:latest
45 timeout: 10 minutes 64 timeout: 10 minutes
@@ -77,25 +96,6 @@ build_src_package:
77 - make install-strip 96 - make install-strip
78 - make print-version 97 - make print-version
79 98
80build_no_apparmor:
81 image: ubuntu:latest
82 timeout: 10 minutes
83 variables:
84 DEBIAN_FRONTEND: noninteractive
85 script:
86 - apt-get update -qy
87 - >
88 apt-get install --no-install-recommends -qy
89 build-essential fakeroot lintian pkg-config gawk
90 | grep -Ev '^(Selecting|Preparing to unpack|Unpacking)'
91 - ./ci/printenv.sh
92 - ./configure || (cat config.log; exit 1)
93 - make dist
94 - ./mkdeb.sh --disable-apparmor
95 - dpkg -i ./*.deb
96 - make print-version
97 - make print-version | grep -F 'AppArmor support is disabled'
98
99debian_ci: 99debian_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
101 timeout: 10 minutes 101 timeout: 10 minutes