diff options
author | smitsohu <smitsohu@gmail.com> | 2019-09-22 13:26:53 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2019-09-22 13:26:53 +0200 |
commit | 04057a4652e889e23b66d95da770e7e7abf75ba5 (patch) | |
tree | 077d19a3bae185e66ee495abff143680ab978246 /.gitlab-ci.yml | |
parent | minor optimization (diff) | |
parent | Inkscape: allow xcf export (diff) | |
download | firejail-04057a4652e889e23b66d95da770e7e7abf75ba5.tar.gz firejail-04057a4652e889e23b66d95da770e7e7abf75ba5.tar.zst firejail-04057a4652e889e23b66d95da770e7e7abf75ba5.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 7 |
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 | ||
15 | build_debian_package: | 16 | build_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 | ||
36 | build_src_package: | 38 | build_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 | ||
44 | build_apparmor: | 47 | build_apparmor: |
45 | image: ubuntu:latest | 48 | image: ubuntu:latest |