diff options
author | 2023-06-14 17:56:37 -0300 | |
---|---|---|
committer | 2023-06-14 18:01:52 -0300 | |
commit | 0585d78d117db0a0cd18e0476d50b063b99ba2ce (patch) | |
tree | 70c6c425c33e8fd2cb243680a85138f3a0cbc279 | |
parent | ci: print config.log if configure fails (diff) | |
download | firejail-0585d78d117db0a0cd18e0476d50b063b99ba2ce.tar.gz firejail-0585d78d117db0a0cd18e0476d50b063b99ba2ce.tar.zst firejail-0585d78d117db0a0cd18e0476d50b063b99ba2ce.zip |
ci: remove commented profile checks from build jobs
There already exists a workflow dedicated to profile checks:
* .github/workflows/profile-checks.yml.
Keep the build and lint jobs separate to make it easier to spot build vs
lint failures in CI.
See also commit c3b42dbd2 ("ci: disable sort.py on gitlab jobs as well",
2023-04-10).
-rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5befc6f4c..c0d390998 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -12,14 +12,12 @@ build_ubuntu_package: | |||
12 | - apt-get update -qq | 12 | - apt-get update -qq |
13 | - > | 13 | - > |
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 gawk |
16 | - ./ci/printenv.sh | 16 | - ./ci/printenv.sh |
17 | - ./configure || (cat config.log; exit 1) | 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 |
21 | # - python3 --version | ||
22 | # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | ||
23 | 21 | ||
24 | build_debian_package: | 22 | build_debian_package: |
25 | image: debian:buster | 23 | image: debian:buster |
@@ -55,22 +53,18 @@ build_fedora_package: | |||
55 | - make rpms | 53 | - make rpms |
56 | - rpm -i firejail*.rpm | 54 | - rpm -i firejail*.rpm |
57 | - command -V firejail && firejail --version | 55 | - command -V firejail && firejail --version |
58 | # - python3 --version | ||
59 | # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | ||
60 | 56 | ||
61 | build_src_package: | 57 | build_src_package: |
62 | image: alpine:latest | 58 | image: alpine:latest |
63 | script: | 59 | script: |
64 | - apk update | 60 | - apk update |
65 | - apk upgrade | 61 | - apk upgrade |
66 | - apk add build-base linux-headers python3 gawk | 62 | - apk add build-base linux-headers gawk |
67 | - ./ci/printenv.sh | 63 | - ./ci/printenv.sh |
68 | - ./configure --prefix=/usr || (cat config.log; exit 1) | 64 | - ./configure --prefix=/usr || (cat config.log; exit 1) |
69 | - make | 65 | - make |
70 | - make install-strip | 66 | - make install-strip |
71 | - command -V firejail && firejail --version | 67 | - command -V firejail && firejail --version |
72 | # - python3 --version | ||
73 | # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | ||
74 | 68 | ||
75 | build_no_apparmor: | 69 | build_no_apparmor: |
76 | image: ubuntu:latest | 70 | image: ubuntu:latest |