From 682e19e94389004ddf1c3b9e95bf4106891763da Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Mon, 30 Jun 2025 13:32:10 +0100 Subject: [PATCH 1/2] add Alpine 3.22 support --- .github/workflows/ci.yml | 10 +++++----- Makefile | 2 +- Makefile.packaging | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c08a667e8..fafa58ba8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,11 +138,11 @@ jobs: - image: "ubuntu" version: "24.04" - image: "alpine" - version: "3.18" + version: "3.20" - image: "alpine" - version: "3.19" + version: "3.21" - image: "alpine" - version: "3.20" + version: "3.22" - image: "alpine" version: "3.21" - image: "debian" @@ -244,12 +244,12 @@ jobs: matrix: container: - image: "alpine" - version: "3.20" + version: "3.21" plus: "r32" release: "alpine" path: "/nginx-plus/agent" - image: "alpine" - version: "3.19" + version: "3.20" plus: "r31" release: "alpine" path: "/nginx-plus/agent" diff --git a/Makefile b/Makefile index 904548fe1..4bb3de3ce 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ GOTIDY = ${GOMOD} tidy # | redhatenterprise | 8, 9 | | # | rockylinux | 8, 9 | | # | almalinux | 8, 9 | | -# | alpine | 3.18, 3.19, 3.20, 3.21 | | +# | alpine | 3.18, 3.19, 3.20, 3.21 3.22 | | # | oraclelinux | 8, 9 | | # | suse | sle15 | | # | freebsd | | Not supported | diff --git a/Makefile.packaging b/Makefile.packaging index 3a6ee9639..952fd5046 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -17,7 +17,7 @@ REDHAT_ARCHS?=aarch64 x86_64 ROCKY_VERSIONS?=rocky-8 rocky-9 ROCKY_ARCHS?=aarch64 x86_64 FREEBSD_DISTROS?="FreeBSD:13:amd64" "FreeBSD:14:amd64" -APK_VERSIONS?=3.18 3.19 3.20 3.21 +APK_VERSIONS?=3.18 3.19 3.20 3.21 3.22 APK_ARCHS?=aarch64 x86_64 ALMA_VERSIONS?=almalinux-8 almalinux-9 ALMA_ARCHS?=aarch64 x86_64 From 2c1582e1ea7aed13374c11dbef946734bf491355 Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Mon, 30 Jun 2025 13:39:58 +0100 Subject: [PATCH 2/2] add Alpine 3.22 support --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fafa58ba8..229c10693 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -244,12 +244,12 @@ jobs: matrix: container: - image: "alpine" - version: "3.21" + version: "3.20" plus: "r32" release: "alpine" path: "/nginx-plus/agent" - image: "alpine" - version: "3.20" + version: "3.19" plus: "r31" release: "alpine" path: "/nginx-plus/agent"