Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: print version after install & fix apparmor support on build_apparmor #5148

Merged
merged 3 commits into from
May 18, 2022
Merged

ci: print version after install & fix apparmor support on build_apparmor #5148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a89ab0
ci: run firejail --version after build/install
kmk3 May 16, 2022
428e068
gitlab-ci: check for apparmor support on build_apparmor
kmk3 May 16, 2022
1f671ab
gitlab-ci: actually link libapparmor on build_apparmor
kmk3 May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build-extra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
run: CC=clang-11 ./configure --enable-fatal-warnings
- name: make
run: make
- name: make install
run: sudo make install
- name: print version
run: command -V firejail && firejail --version
scan-build:
runs-on: ubuntu-20.04
steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@ jobs:
run: make
- name: make install
run: sudo make install
- name: print version
run: command -V firejail && firejail --version
- name: run tests
run: SHELL=/bin/bash make test-github
9 changes: 8 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ build_ubuntu_package:
- apt-get update -qq
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk
- ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
- command -V firejail && firejail --version
- python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc

build_debian_package:
Expand All @@ -19,20 +20,23 @@ build_debian_package:
- apt-get update -qq
- apt-get install -y -qq build-essential lintian pkg-config gawk
- ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
- command -V firejail && firejail --version

build_redhat_package:
image: almalinux:latest
script:
- dnf update -y
- dnf install -y rpm-build gcc make
- ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm
- command -V firejail && firejail --version

build_fedora_package:
image: fedora:latest
script:
- dnf update -y
- dnf install -y rpm-build gcc make
- ./configure --prefix=/usr && make rpms && rpm -i firejail*.rpm
- command -V firejail && firejail --version
- python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc

build_src_package:
Expand All @@ -42,14 +46,17 @@ build_src_package:
- apk upgrade
- apk add build-base linux-headers python3 gawk
- ./configure --prefix=/usr && make && make install-strip
- command -V firejail && firejail --version
# - python3 contrib/sort.py etc/*.{profile,inc}

build_apparmor:
image: ubuntu:latest
script:
- apt-get update -qq
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk
- ./configure --prefix=/usr && make deb-apparmor && dpkg -i firejail*.deb
- ./configure --prefix=/usr --enable-apparmor && make deb-apparmor && dpkg -i firejail*.deb
- command -V firejail && firejail --version
- firejail --version | grep -F 'AppArmor support is enabled'

debian_ci:
image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest
Expand Down