aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-04-10 16:53:06 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-04-10 20:30:39 -0300
commitf962c9e03831c27daba6bb19fb7595757396e5c2 (patch)
treee0c38133345765d88aaced0fdea51485957fca69 /.gitlab-ci.yml
parentRELNOTES: bump release date to fix gitlab ci (diff)
downloadfirejail-f962c9e03831c27daba6bb19fb7595757396e5c2.tar.gz
firejail-f962c9e03831c27daba6bb19fb7595757396e5c2.tar.zst
firejail-f962c9e03831c27daba6bb19fb7595757396e5c2.zip
ci: split configure/build/install commands on gitlab
Split them into separate steps to make it clearer in the logs which command causes a job to fail when it does. Note that they are already spli in the GitHub workflows: * .github/workflows/build.yml * .github/workflows/build-extra.yml
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml25
1 files changed, 19 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b30dd9ee4..a75fbbb90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,9 @@ build_ubuntu_package:
10 script: 10 script:
11 - apt-get update -qq 11 - apt-get update -qq
12 - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config python3 gawk 12 - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config python3 gawk
13 - ./configure && make deb && dpkg -i firejail*.deb 13 - ./configure
14 - make deb
15 - dpkg -i firejail*.deb
14 - command -V firejail && firejail --version 16 - command -V firejail && firejail --version
15 # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc 17 # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc
16 18
@@ -19,7 +21,9 @@ build_debian_package:
19 script: 21 script:
20 - apt-get update -qq 22 - apt-get update -qq
21 - apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk 23 - apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk
22 - ./configure && make deb && dpkg -i firejail*.deb 24 - ./configure
25 - make deb
26 - dpkg -i firejail*.deb
23 - command -V firejail && firejail --version 27 - command -V firejail && firejail --version
24 28
25build_redhat_package: 29build_redhat_package:
@@ -27,7 +31,9 @@ build_redhat_package:
27 script: 31 script:
28 - dnf update -y 32 - dnf update -y
29 - dnf install -y rpm-build gcc make 33 - dnf install -y rpm-build gcc make
30 - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm 34 - ./configure --prefix=/usr
35 - make rpms
36 - rpm -i firejail*.rpm
31 - command -V firejail && firejail --version 37 - command -V firejail && firejail --version
32 38
33build_fedora_package: 39build_fedora_package:
@@ -35,7 +41,9 @@ build_fedora_package:
35 script: 41 script:
36 - dnf update -y 42 - dnf update -y
37 - dnf install -y rpm-build gcc make 43 - dnf install -y rpm-build gcc make
38 - ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm 44 - ./configure --prefix=/usr
45 - make rpms
46 - rpm -i firejail*.rpm
39 - command -V firejail && firejail --version 47 - command -V firejail && firejail --version
40 # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc 48 # - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc
41 49
@@ -45,7 +53,9 @@ build_src_package:
45 - apk update 53 - apk update
46 - apk upgrade 54 - apk upgrade
47 - apk add build-base linux-headers python3 gawk 55 - apk add build-base linux-headers python3 gawk
48 - ./configure --prefix=/usr && make && make install-strip 56 - ./configure --prefix=/usr
57 - make
58 - make install-strip
49 - command -V firejail && firejail --version 59 - command -V firejail && firejail --version
50 # - python3 contrib/sort.py etc/*.{profile,inc} 60 # - python3 contrib/sort.py etc/*.{profile,inc}
51 61
@@ -54,7 +64,10 @@ build_no_apparmor:
54 script: 64 script:
55 - apt-get update -qq 65 - apt-get update -qq
56 - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config gawk 66 - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config gawk
57 - ./configure && make dist && ./mkdeb.sh --disable-apparmor && dpkg -i firejail*.deb 67 - ./configure
68 - make dist
69 - ./mkdeb.sh --disable-apparmor
70 - dpkg -i firejail*.deb
58 - command -V firejail && firejail --version 71 - command -V firejail && firejail --version
59 - firejail --version | grep -F 'AppArmor support is disabled' 72 - firejail --version | grep -F 'AppArmor support is disabled'
60 73