diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml index 33f1ab4..9510d6c 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.18' - 'alpine:3.19' + - 'alpine:3.20' - 'debian:11' - 'debian:12' - 'fedora:39' diff --git a/README.md b/README.md index 5125309..64d006e 100644 --- a/README.md +++ b/README.md @@ -124,9 +124,9 @@ The `.apk`, `.rpm` and `.deb` packages for Alpine, CentOS/RHEL, Debian, and Fedo Command | Distribution -------------------- | ------------ -Alpine 3.17 | `make -C packages alpine-3.17` Alpine 3.18 | `make -C packages alpine-3.18` Alpine 3.19 | `make -C packages alpine-3.19` +Alpine 3.20 | `make -C packages alpine-3.20` CentOS Stream 8 | `make -C packages centos-stream-8` CentOS Stream 9 | `make -C packages centos-stream-9` Debian 10 (Buster) | `make -C packages debian-buster` diff --git a/packages/Makefile.am b/packages/Makefile.am index 1206fa8..b7fbe92 100644 --- a/packages/Makefile.am +++ b/packages/Makefile.am @@ -33,10 +33,10 @@ MULTIBUILD_OPTS = \ --pckver $(PACKAGE_VERSION) TARGETS_ALPINE = \ - alpine-3.17 \ alpine-3.18 \ - alpine-3.19 -alpine-latest: alpine-3.19 + alpine-3.19 \ + alpine-3.20 +alpine-latest: alpine-3.20 TARGETS_CENTOS_STREAM = \ centos-stream-8 centos-stream-9 diff --git a/packages/multibuild.sh b/packages/multibuild.sh index 9410063..cbbf6e5 100755 --- a/packages/multibuild.sh +++ b/packages/multibuild.sh @@ -135,7 +135,7 @@ case "$os" in alpine-*) pck_format="apk" pck_install="apk add" - pcks_dev="alpine-sdk curl-dev" + pcks_dev="alpine-sdk autoconf automake bzip2 curl-dev libtool linux-headers m4 xz" have_libcurl="1" have_libvarlink="0" ;; @@ -203,7 +203,7 @@ case $os in addgroup -g 1000 developers adduser -D -G developers -u 1000 -s /bin/sh developer addgroup developer abuild - #abuild-keygen -a -i + #abuild-keygen -a -i -n ;; *) groupadd -g $usr_gid developers useradd -m -g $usr_gid -u $usr_uid -s /bin/bash developer @@ -227,11 +227,13 @@ if [ \"'$pck_format'\" = apk ]; then echo find /home/developer/.abuild/ -name \"*rsa*\" -exec cat {} \\; echo + source .abuild/abuild.conf + export PACKAGER_PRIVKEY=\"\$PACKAGER_PRIVKEY\" msg \"creating the apk packages ...\" cd ~/${pckname} abuild checksum - abuild -r + abuild if [ \"'$targetdir'\" ]; then msg \"copying the apk packages to the target folder ...\"