aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2018-11-02 22:08:18 -0500
committerLibravatar Fred-Barclay <Fred-Barclay@users.noreply.github.com>2018-11-02 22:08:18 -0500
commitd92d89b4f2d50e977f4870afc84fcff4acabebd0 (patch)
treeeffd4dbf0e03d3ae2a6522237a04dd75e46bbc2a
parentAdd Mendeley profile (diff)
downloadfirejail-d92d89b4f2d50e977f4870afc84fcff4acabebd0.tar.gz
firejail-d92d89b4f2d50e977f4870afc84fcff4acabebd0.tar.zst
firejail-d92d89b4f2d50e977f4870afc84fcff4acabebd0.zip
Begin using gitlab for building to save time on auto code tests.
Code tests are still run on Travis CI, but distro-specific builds are run on GitLab CI. Currently these are used: 1. Debian stable 2. Ubuntu latest 3. CentOS latest 4. Fedora latest 5. Alpine Debian and CentOS are for testing builds on older systems, for *.deb vs *.rpm, respectively. Ubuntu and Fedora are for testing builds on the latest **stable** systems for *.deb and *.rpm. Alpine is used to test building/installing from source. All run concurrently. In the future may expand tests on Gitlab to cover code testing as well.
-rw-r--r--.gitlab-ci.yml41
-rw-r--r--.travis.yml4
-rw-r--r--README.md3
3 files changed, 43 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..555643b6f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,41 @@
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
3# compat and ubuntu:latest for new setups
4# 2. Redhat-based systems. Use centos:latest for reasonable backwards compat
5# and fedora:latest for new setups
6# 3. Alpine for installing directly from source
7build_ubuntu_package:
8 image: ubuntu:latest
9 script:
10 - apt-get update -qq
11 - apt-get install -y -qq build-essential lintian
12 - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
13
14build_debian_package:
15 image: debian:jessie
16 script:
17 - apt-get update -qq
18 - apt-get install -y -qq build-essential lintian
19 - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
20
21build_redhat_package:
22 image: centos:latest
23 script:
24 - yum update -y
25 - yum install -y rpm-build gcc make
26 - ./configure --prefix=/usr && make rpms && yum install -y firejail*.rpm
27
28build_fedora_package:
29 image: fedora:latest
30 script:
31 - dnf update -y
32 - dnf install -y rpm-build gcc make
33 - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm
34
35build_src_package:
36 image: alpine:latest
37 script:
38 - apk update
39 - apk upgrade
40 - apk add build-base linux-headers
41 - ./configure --prefix=/usr && make && make install-strip
diff --git a/.travis.yml b/.travis.yml
index 448ba2a84..5df088264 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,6 @@ sudo: true
4 4
5script: 5script:
6 - sudo apt-get -y install expect csh xzdec lintian fakeroot 6 - sudo apt-get -y install expect csh xzdec lintian fakeroot
7 # Build Debian package
8 - ( ./configure --prefix=/usr && make deb && sudo dpkg -i firejail*.deb )
9 # Remove Debian package
10 - ( sudo dpkg -P firejail )
11 - ( ./configure --prefix=/usr && make && sudo make install && make test-travis ) 7 - ( ./configure --prefix=/usr && make && sudo make install && make test-travis )
12 - ( sudo make install-strip DESTDIR=$(readlink -f appdir) ) 8 - ( sudo make install-strip DESTDIR=$(readlink -f appdir) )
13 # If successful, build release tarball 9 # If successful, build release tarball
diff --git a/README.md b/README.md
index aef9d265d..4998d596b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
1# Firejail 1# Firejail
2[![Build Status](https://travis-ci.org/netblue30/firejail.svg?branch=master)](https://travis-ci.org/netblue30/firejail) 2[![Test Status](https://travis-ci.org/netblue30/firejail.svg?branch=master)](https://travis-ci.org/netblue30/firejail)
3[![Build Status](https://gitlab.com/Firejail/firejail_ci/badges/master/pipeline.svg)](https://gitlab.com/Firejail/firejail_ci)
3 4
4Firejail is a SUID sandbox program that reduces the risk of security breaches by restricting 5Firejail is a SUID sandbox program that reduces the risk of security breaches by restricting
5the running environment of untrusted applications using Linux namespaces, seccomp-bpf 6the running environment of untrusted applications using Linux namespaces, seccomp-bpf