diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-04-10 07:59:01 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-04-10 15:14:31 -0300 |
| commit | c3b42dbd2609cef8ce029e39137a5a265380de36 (patch) | |
| tree | e769dc948d6f9ae47280f6e0199e26259f8ae2ba /.gitlab-ci.yml | |
| parent | RELNOTES: add docs item (diff) | |
| download | firejail-c3b42dbd2609cef8ce029e39137a5a265380de36.tar.gz firejail-c3b42dbd2609cef8ce029e39137a5a265380de36.tar.zst firejail-c3b42dbd2609cef8ce029e39137a5a265380de36.zip | |
ci: disable sort.py on gitlab jobs as well
This is currently causing the following jobs to fail on GitLab[1]:
* build_ubuntu_package
* build_fedora_package
See commit df6ea884f ("merges, disable sort.py in profile checks
temporarely, two more private-etc profiles", 2023-02-14).
[1] https://gitlab.com/Firejail/firejail_ci/-/pipelines/832588068
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6dcb40e67..b30dd9ee4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
| @@ -12,7 +12,7 @@ build_ubuntu_package: | |||
| 12 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config python3 gawk | 12 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config python3 gawk |
| 13 | - ./configure && make deb && dpkg -i firejail*.deb | 13 | - ./configure && make deb && dpkg -i firejail*.deb |
| 14 | - command -V firejail && firejail --version | 14 | - command -V firejail && firejail --version |
| 15 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | 15 | # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc |
| 16 | 16 | ||
| 17 | build_debian_package: | 17 | build_debian_package: |
| 18 | image: debian:stretch | 18 | image: debian:stretch |
| @@ -37,7 +37,7 @@ build_fedora_package: | |||
| 37 | - dnf install -y rpm-build gcc make | 37 | - dnf install -y rpm-build gcc make |
| 38 | - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm | 38 | - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm |
| 39 | - command -V firejail && firejail --version | 39 | - command -V firejail && firejail --version |
| 40 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | 40 | # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc |
| 41 | 41 | ||
| 42 | build_src_package: | 42 | build_src_package: |
| 43 | image: alpine:latest | 43 | image: alpine:latest |