Skip to content

Commit 786e7de

Browse files
committed
packages: add Alpine 23, drop Alpine 20
Signed-off-by: Davide Madrisan <d.madrisan@proton.me>
1 parent 86596b9 commit 786e7de

3 files changed

Lines changed: 16 additions & 10 deletions

File tree

.github/workflows/build-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
container:
19-
- 'alpine:3.21'
2019
- 'alpine:3.22'
20+
- 'alpine:3.23'
2121
- 'debian:12'
2222
- 'debian:13'
2323
- 'fedora:42'

packages/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ MULTIBUILD_OPTS = \
3333
--pckver $(PACKAGE_VERSION)
3434

3535
TARGETS_ALPINE = \
36-
alpine-3.20 \
3736
alpine-3.21 \
38-
alpine-3.22
39-
alpine-latest: alpine-3.22
37+
alpine-3.22 \
38+
alpine-3.23
39+
alpine-latest: alpine-3.23
4040

4141
TARGETS_CENTOS_STREAM = \
4242
centos-stream-8 centos-stream-9

packages/multibuild.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#!/bin/bash
22
# Multi-platform build system
3-
# Copyright (C) 2016-2024 Davide Madrisan <davide.madrisan@gmail.com>
3+
# Copyright (C) 2016-2026 Davide Madrisan <davide.madrisan@gmail.com>
44

55
PROGNAME="${0##*/}"
66
PROGPATH="${0%/*}"
77
REVISION=3
88

99
die () { echo -e "$PROGNAME: error: $1" 1>&2; exit 1; }
1010
msg () { echo "*** info: $1"; }
11+
msg_debug () { echo "*** debug: $1"; }
1112

1213
docker_helpers="$PROGPATH/docker-shell-helpers/docker-shell-helpers.sh"
1314

@@ -33,11 +34,10 @@ Where:
3334
-u|--uid : user ID of the user 'developer' used for building the software
3435
3536
Supported distributions:
36-
Alpine Linux 17-19
37-
CentOS 5-8
37+
Alpine Linux 21-23
3838
CentOS Stream 8, 9
39-
Debian 9-12
40-
Fedora 33-38/rawhide
39+
Debian 11-13
40+
Fedora 41-43/rawhide
4141
Rocky Linux 8, 9
4242
4343
Example:
@@ -53,7 +53,7 @@ __EOF
5353
help () {
5454
cat <<__EOF
5555
$PROGNAME v$REVISION - containerized software build checker
56-
Copyright (C) 2016-2023 Davide Madrisan <davide.madrisan@gmail.com>
56+
Copyright (C) 2016-2026 Davide Madrisan <davide.madrisan@gmail.com>
5757
5858
__EOF
5959

@@ -104,6 +104,9 @@ IFS="$IFS_save"
104104
([ "$shared_disk_host" ] && [ "$shared_disk_container" ]) ||
105105
die "bad syntax for --shared"
106106

107+
msg_debug "shared_disk_host is $shared_disk_host"
108+
msg_debug "shared_disk_container is $shared_disk_container"
109+
107110
if [ "$usr_specfile" ]; then
108111
specfile="$(readlink -f "$usr_specfile")"
109112
case "$specfile" in
@@ -122,6 +125,9 @@ if [ "$usr_targetdir" ]; then
122125
fi
123126

124127
msg "instantiating a new container based on $usr_os ..."
128+
msg_debug "\
129+
executing: container_create --random-name --os $usr_os \
130+
--disk $shared_disk_host:$shared_disk_container"
125131
container="$(container_create --random-name --os "$usr_os" \
126132
--disk "$shared_disk_host:$shared_disk_container")" ||
127133
die "failed to create a new container with os $usr_os"

0 commit comments

Comments
 (0)