ci: fix opensuse build & re-enable ubuntu preprocess.

This commit is contained in:
Alexandre Pujol 2024-06-04 20:26:32 +01:00
parent 8b60e56002
commit 70697cf315
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC

View File

@ -119,7 +119,7 @@ opensuse:
image: registry.gitlab.com/roddhjav/builders/opensuse image: registry.gitlab.com/roddhjav/builders/opensuse
script: script:
- mkdir -p "$PKGDEST" - mkdir -p "$PKGDEST"
- sudo zypper install -y distribution-release golang-packaging rsync - sudo zypper install -y distribution-release golang-packaging rsync apparmor-profiles
- bash dists/build.sh rpm - bash dists/build.sh rpm
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
@ -151,11 +151,16 @@ preprocess-debian:
- dpkg --install $PKGDEST/* - dpkg --install $PKGDEST/*
- apparmor_parser --preprocess /etc/apparmor.d 1> /dev/null - apparmor_parser --preprocess /etc/apparmor.d 1> /dev/null
.preprocess-ubuntu: preprocess-ubuntu:
extends: preprocess-debian stage: preprocess
image: ubuntu image: ubuntu
dependencies: dependencies:
- ubuntu - ubuntu
script:
- apt-get update -q
- apt-get install -y apparmor apparmor-profiles
- dpkg --install $PKGDEST/*
- apparmor_parser --preprocess /etc/apparmor.d 1> /dev/null
preprocess-whonix: preprocess-whonix:
extends: preprocess-debian extends: preprocess-debian