From 3ef00dab3464d0011dbd99987ed786f8d054cf35 Mon Sep 17 00:00:00 2001 From: Fred-Barclay Date: Sat, 26 Jan 2019 10:57:07 -0600 Subject: Switch ubuntu:latest to ubuntu:rolling for Gitlab CI Ubuntu:rolling is the latest Ubuntu release (LTS and/or non-LTS). Since debian:latest already provides a reasonable base for testing firejail builds on older Debian-based systems, use ubuntu:rolling to test on relatively new systems. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 555643b6f..a3d4fcc6e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,11 @@ # Basic notes: builds firejail on 5 different systems for 2 package systems: # 1. Debian-based systems. Use debian:jessie to ensure reasonable backwards -# compat and ubuntu:latest for new setups +# compat and ubuntu:rolling for new setups # 2. Redhat-based systems. Use centos:latest for reasonable backwards compat # and fedora:latest for new setups # 3. Alpine for installing directly from source build_ubuntu_package: - image: ubuntu:latest + image: ubuntu:rolling script: - apt-get update -qq - apt-get install -y -qq build-essential lintian -- cgit v1.2.3-54-g00ecf From 342e71cd870e1949b410dfc8ee21a292aa292e2e Mon Sep 17 00:00:00 2001 From: Fred-Barclay Date: Sat, 26 Jan 2019 11:37:00 -0600 Subject: Add deb-apparmor build to Gitlab CI --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3d4fcc6e..c08d3b2e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ # 2. Redhat-based systems. Use centos:latest for reasonable backwards compat # and fedora:latest for new setups # 3. Alpine for installing directly from source +# Also builds apparmor package for Ubuntu LTS build_ubuntu_package: image: ubuntu:rolling script: @@ -39,3 +40,10 @@ build_src_package: - apk upgrade - apk add build-base linux-headers - ./configure --prefix=/usr && make && make install-strip + +build_apparmor: + image: ubuntu:latest + script: + - apt-get update -qq + - apt-get install -y -qq build-essential lintian libapparmor-dev + - ./configure --prefix=/usr && make deb-apparmor && dpkg -i firejail-apparmor*.deb -- cgit v1.2.3-54-g00ecf