Skip to content

Commit

Permalink
packages: Add Linux Alpine 3.20 and drop version 3.17
Browse files Browse the repository at this point in the history
Signed-off-by: Davide Madrisan <d.madrisan@qwant.com>
  • Loading branch information
Davide Madrisan committed Jun 12, 2024
1 parent 98f53c8 commit 0589e3d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
6 changes: 3 additions & 3 deletions packages/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions packages/multibuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down Expand Up @@ -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
Expand All @@ -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 ...\"
Expand Down

0 comments on commit 0589e3d

Please sign in to comment.