From 786e7dea0a9060b8342bbcb96a029fb1c63aa8d3 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Sat, 3 Jan 2026 09:05:31 +0100 Subject: [PATCH] packages: add Alpine 23, drop Alpine 20 Signed-off-by: Davide Madrisan --- .github/workflows/build-checks.yml | 2 +- packages/Makefile.am | 6 +++--- packages/multibuild.sh | 18 ++++++++++++------ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml index 5c37900..5d72641 100644 --- a/.github/workflows/build-checks.yml +++ b/.github/workflows/build-checks.yml @@ -16,8 +16,8 @@ jobs: fail-fast: false matrix: container: - - 'alpine:3.21' - 'alpine:3.22' + - 'alpine:3.23' - 'debian:12' - 'debian:13' - 'fedora:42' diff --git a/packages/Makefile.am b/packages/Makefile.am index 2c995cd..7135d54 100644 --- a/packages/Makefile.am +++ b/packages/Makefile.am @@ -33,10 +33,10 @@ MULTIBUILD_OPTS = \ --pckver $(PACKAGE_VERSION) TARGETS_ALPINE = \ - alpine-3.20 \ alpine-3.21 \ - alpine-3.22 -alpine-latest: alpine-3.22 + alpine-3.22 \ + alpine-3.23 +alpine-latest: alpine-3.23 TARGETS_CENTOS_STREAM = \ centos-stream-8 centos-stream-9 diff --git a/packages/multibuild.sh b/packages/multibuild.sh index cbbf6e5..7a1eb55 100755 --- a/packages/multibuild.sh +++ b/packages/multibuild.sh @@ -1,6 +1,6 @@ #!/bin/bash # Multi-platform build system -# Copyright (C) 2016-2024 Davide Madrisan +# Copyright (C) 2016-2026 Davide Madrisan PROGNAME="${0##*/}" PROGPATH="${0%/*}" @@ -8,6 +8,7 @@ REVISION=3 die () { echo -e "$PROGNAME: error: $1" 1>&2; exit 1; } msg () { echo "*** info: $1"; } +msg_debug () { echo "*** debug: $1"; } docker_helpers="$PROGPATH/docker-shell-helpers/docker-shell-helpers.sh" @@ -33,11 +34,10 @@ Where: -u|--uid : user ID of the user 'developer' used for building the software Supported distributions: - Alpine Linux 17-19 - CentOS 5-8 + Alpine Linux 21-23 CentOS Stream 8, 9 - Debian 9-12 - Fedora 33-38/rawhide + Debian 11-13 + Fedora 41-43/rawhide Rocky Linux 8, 9 Example: @@ -53,7 +53,7 @@ __EOF help () { cat <<__EOF $PROGNAME v$REVISION - containerized software build checker -Copyright (C) 2016-2023 Davide Madrisan +Copyright (C) 2016-2026 Davide Madrisan __EOF @@ -104,6 +104,9 @@ IFS="$IFS_save" ([ "$shared_disk_host" ] && [ "$shared_disk_container" ]) || die "bad syntax for --shared" +msg_debug "shared_disk_host is $shared_disk_host" +msg_debug "shared_disk_container is $shared_disk_container" + if [ "$usr_specfile" ]; then specfile="$(readlink -f "$usr_specfile")" case "$specfile" in @@ -122,6 +125,9 @@ if [ "$usr_targetdir" ]; then fi msg "instantiating a new container based on $usr_os ..." +msg_debug "\ +executing: container_create --random-name --os $usr_os \ +--disk $shared_disk_host:$shared_disk_container" container="$(container_create --random-name --os "$usr_os" \ --disk "$shared_disk_host:$shared_disk_container")" || die "failed to create a new container with os $usr_os"