From 2e14c1a1d0784acc7536158df3eb7ea58cb73ff7 Mon Sep 17 00:00:00 2001 From: Fred Barclay Date: Sat, 21 Sep 2019 10:19:38 -0500 Subject: 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 --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') 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: image: ubuntu:rolling script: - apt-get update -qq - - apt-get install -y -qq build-essential lintian pkg-config + - apt-get install -y -qq build-essential lintian pkg-config python3 - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb + - python3 contrib/sort.py etc/*.{profile,inc} build_debian_package: image: debian:jessie @@ -32,14 +33,16 @@ build_fedora_package: - dnf update -y - dnf install -y rpm-build gcc make - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm + - python3 contrib/sort.py etc/*.{profile,inc} build_src_package: image: alpine:latest script: - apk update - apk upgrade - - apk add build-base linux-headers + - apk add build-base linux-headers python3 - ./configure --prefix=/usr && make && make install-strip + # - python3 contrib/sort.py etc/*.{profile,inc} build_apparmor: image: ubuntu:latest -- cgit v1.2.3-54-g00ecf