aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorLibravatar Fred Barclay <Fred-Barclay@users.noreply.github.com>2019-09-21 10:19:38 -0500
committerLibravatar GitHub <noreply@github.com>2019-09-21 10:19:38 -0500
commit2e14c1a1d0784acc7536158df3eb7ea58cb73ff7 (patch)
tree8ca1bf0c84379c03a5932b5fb21d794b1ef99140 /.gitlab-ci.yml
parentreadd .config/dconf to whitelist-common because … (diff)
downloadfirejail-2e14c1a1d0784acc7536158df3eb7ea58cb73ff7.tar.gz
firejail-2e14c1a1d0784acc7536158df3eb7ea58cb73ff7.tar.zst
firejail-2e14c1a1d0784acc7536158df3eb7ea58cb73ff7.zip
Adding sort.py to GitLab CI (#2973)
* Add contrib/sort.py to Gitlab CI Not adding to Debian Jessie or CentOS since python >=3.6 is not available See https://github.com/netblue30/firejail/pull/2870 * Updates Explicitly install python3 on Ubuntu (should be pre-installed but not working as-is) Remove running python3 code on CentOS * ci: comment out contrib/sort.py for Alpine Getting this error: $ python3 contrib/sort.py etc/*.{profile,inc} [ Error ] Can't find `etc/*.{profile,inc}' ERROR: Job failed: exit code 1 For now it's better to debug later and enable this test for the other jobs
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37e5cc2d0..19dd2b320 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,9 @@ build_ubuntu_package:
9 image: ubuntu:rolling 9 image: ubuntu:rolling
10 script: 10 script:
11 - apt-get update -qq 11 - apt-get update -qq
12 - apt-get install -y -qq build-essential lintian pkg-config 12 - apt-get install -y -qq build-essential lintian pkg-config python3
13 - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb 13 - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
14 - python3 contrib/sort.py etc/*.{profile,inc}
14 15
15build_debian_package: 16build_debian_package:
16 image: debian:jessie 17 image: debian:jessie
@@ -32,14 +33,16 @@ build_fedora_package:
32 - dnf update -y 33 - dnf update -y
33 - dnf install -y rpm-build gcc make 34 - dnf install -y rpm-build gcc make
34 - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm 35 - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm
36 - python3 contrib/sort.py etc/*.{profile,inc}
35 37
36build_src_package: 38build_src_package:
37 image: alpine:latest 39 image: alpine:latest
38 script: 40 script:
39 - apk update 41 - apk update
40 - apk upgrade 42 - apk upgrade
41 - apk add build-base linux-headers 43 - apk add build-base linux-headers python3
42 - ./configure --prefix=/usr && make && make install-strip 44 - ./configure --prefix=/usr && make && make install-strip
45 # - python3 contrib/sort.py etc/*.{profile,inc}
43 46
44build_apparmor: 47build_apparmor:
45 image: ubuntu:latest 48 image: ubuntu:latest