From 17fbae9712e511481997ea4a78b1d0f38a53ea42 Mon Sep 17 00:00:00 2001 From: Sean Breen <101327931+sean-breen@users.noreply.github.com> Date: Mon, 15 Dec 2025 12:18:12 +0000 Subject: [PATCH 1/2] [V3] Add support for Alpine 3.23 (#1441) * support alpine 3.23 * update supported OSes in Makefile --- .github/workflows/ci.yml | 2 +- Makefile | 2 +- Makefile.packaging | 2 +- scripts/packages/package-check.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7935d250..601e42647 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -188,7 +188,7 @@ jobs: - image: "redhatenterprise" version: "9" - image: "alpine" - version: "3.22" + version: "3.23" steps: - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0 - name: Configure Go Proxy diff --git a/Makefile b/Makefile index 0bf3c3379..e9877a85f 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ GOBIN ?= $$(go env GOPATH)/bin # | redhatenterprise | 8, 9, 10 | | # | rockylinux | 8, 9, 10 | | # | almalinux | 8, 9, 10 | | -# | alpine | 3.20, 3.21 3.22 | | +# | alpine | 3.20, 3.21 3.22 3.23 | | # | oraclelinux | 8, 9, 10 | | # | suse | sle15, sle16 | | # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # diff --git a/Makefile.packaging b/Makefile.packaging index ecc772059..e9ab80413 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -18,7 +18,7 @@ RPM_DISTROS ?= suse-15-x86_64 suse-16-x86_64 RPM_ARCH := x86_64 REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10 REDHAT_ARCHS ?= aarch64 x86_64 -APK_VERSIONS ?= 3.20 3.21 3.22 +APK_VERSIONS ?= 3.20 3.21 3.22 3.23 APK_ARCHS ?= aarch64 x86_64 APK_REVISION ?= 1 AMAZON_VERSIONS ?= amazon-2 amazon-2023 diff --git a/scripts/packages/package-check.sh b/scripts/packages/package-check.sh index eec17de8c..b97750b33 100755 --- a/scripts/packages/package-check.sh +++ b/scripts/packages/package-check.sh @@ -62,7 +62,7 @@ majorVersion=$(echo ${VERSION} | cut -d. -f1) # Define package URIs to check for each platform APK=() -ALPINE_VERSIONS=("3.22" "3.21" "3.20") +ALPINE_VERSIONS=("3.23" "3.22" "3.21" "3.20") ALPINE_ARCH=("x86_64" "aarch64") for alpine_version in "${ALPINE_VERSIONS[@]}"; do for arch in ${ALPINE_ARCH[@]}; do From f4a3c333d2b36252435fcc9a403af1eacbe9c432 Mon Sep 17 00:00:00 2001 From: Sean Breen <101327931+sean-breen@users.noreply.github.com> Date: Tue, 16 Dec 2025 14:53:35 +0000 Subject: [PATCH 2/2] Fix typo in package check (#1459) * fix typo in SLES path, add ubuntu questing * fix typo in SLES path, add ubuntu questing --- scripts/packages/package-check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/packages/package-check.sh b/scripts/packages/package-check.sh index b97750b33..3180562d3 100755 --- a/scripts/packages/package-check.sh +++ b/scripts/packages/package-check.sh @@ -71,7 +71,7 @@ for alpine_version in "${ALPINE_VERSIONS[@]}"; do done UBUNTU=() -UBUNTU_VERSIONS=("jammy" "noble" "plucky") +UBUNTU_VERSIONS=("jammy" "noble" "plucky" "questing") DEB_ARCH=("amd64" "arm64") for ubuntu_version in "${UBUNTU_VERSIONS[@]}"; do for arch in ${DEB_ARCH[@]}; do @@ -103,7 +103,7 @@ for arch in ${RPM_ARCH[@]}; do done SUSE=() -SUSE_VERSIONS=("15", "16") +SUSE_VERSIONS=("15" "16") for suse_version in "${SUSE_VERSIONS[@]}"; do SUSE+=("sles/${suse_version}/x86_64/RPMS/nginx-agent-$VERSION.sles${suse_version}.ngx.x86_64.rpm") done