Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,10 @@ jobs:
- name: centos-stream10
base_image: quay.io/centos-bootc/centos-bootc:stream10
cfsctl_features: pre-6.15
- name: debian
base_image: ghcr.io/bootcrew/debian-bootc:latest
cfsctl_features: oci
# Temporarily disabled
# - name: debian
# base_image: ghcr.io/bootcrew/debian-bootc:latest
# cfsctl_features: oci
env:
COMPOSEFS_BASE_IMAGE: ${{ matrix.base_image }}
COMPOSEFS_CFSCTL_FEATURES: ${{ matrix.cfsctl_features }}
Expand Down
12 changes: 11 additions & 1 deletion contrib/packaging/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,17 @@ debian_apt_init() {
pkg_install() {
case "${ID}" in
centos|fedora|rhel)
dnf install -y "$@"
# Filter out already-installed packages to avoid unintended
# upgrades (e.g. podman 5→6 without a matching netavark bump).
local -a to_install=()
for pkg in "$@"; do
if ! rpm -q "$pkg" &>/dev/null; then
to_install+=("$pkg")
fi
done
if [ ${#to_install[@]} -gt 0 ]; then
dnf install -y "${to_install[@]}"
fi
dnf clean all
;;
debian|ubuntu)
Expand Down