diff options
author | netblue30 <netblue30@yahoo.com> | 2019-01-26 13:54:52 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2019-01-26 13:54:52 -0500 |
commit | cdb0d8dc52aab233421a8dfc72537a925efee3b2 (patch) | |
tree | 5e9a105c421369845a0b32287854e86ef7760f6d | |
parent | fix seccomp-run-files.exp (diff) | |
parent | Add deb-apparmor build to Gitlab CI (diff) | |
download | firejail-cdb0d8dc52aab233421a8dfc72537a925efee3b2.tar.gz firejail-cdb0d8dc52aab233421a8dfc72537a925efee3b2.tar.zst firejail-cdb0d8dc52aab233421a8dfc72537a925efee3b2.zip |
Merge branch 'master' of http://github.com/netblue30/firejail0.9.58
-rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 555643b6f..c08d3b2e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
@@ -1,11 +1,12 @@ | |||
1 | # Basic notes: builds firejail on 5 different systems for 2 package systems: | 1 | # Basic notes: builds firejail on 5 different systems for 2 package systems: |
2 | # 1. Debian-based systems. Use debian:jessie to ensure reasonable backwards | 2 | # 1. Debian-based systems. Use debian:jessie to ensure reasonable backwards |
3 | # compat and ubuntu:latest for new setups | 3 | # compat and ubuntu:rolling for new setups |
4 | # 2. Redhat-based systems. Use centos:latest for reasonable backwards compat | 4 | # 2. Redhat-based systems. Use centos:latest for reasonable backwards compat |
5 | # and fedora:latest for new setups | 5 | # and fedora:latest for new setups |
6 | # 3. Alpine for installing directly from source | 6 | # 3. Alpine for installing directly from source |
7 | # Also builds apparmor package for Ubuntu LTS | ||
7 | build_ubuntu_package: | 8 | build_ubuntu_package: |
8 | image: ubuntu:latest | 9 | image: ubuntu:rolling |
9 | script: | 10 | script: |
10 | - apt-get update -qq | 11 | - apt-get update -qq |
11 | - apt-get install -y -qq build-essential lintian | 12 | - apt-get install -y -qq build-essential lintian |
@@ -39,3 +40,10 @@ build_src_package: | |||
39 | - apk upgrade | 40 | - apk upgrade |
40 | - apk add build-base linux-headers | 41 | - apk add build-base linux-headers |
41 | - ./configure --prefix=/usr && make && make install-strip | 42 | - ./configure --prefix=/usr && make && make install-strip |
43 | |||
44 | build_apparmor: | ||
45 | image: ubuntu:latest | ||
46 | script: | ||
47 | - apt-get update -qq | ||
48 | - apt-get install -y -qq build-essential lintian libapparmor-dev | ||
49 | - ./configure --prefix=/usr && make deb-apparmor && dpkg -i firejail-apparmor*.deb | ||