diff --git a/Makefile b/Makefile index 4a63c9e40..0bf3c3379 100644 --- a/Makefile +++ b/Makefile @@ -17,14 +17,14 @@ GOBIN ?= $$(go env GOPATH)/bin # | OS_RELEASE | OS_VERSION | NOTES | # | ---------------- | ----------------------------------------- | -------------------------------------------------------------- | # | amazonlinux | 2, 2023 | | -# | ubuntu | 22.04, 24.04 25.04 | | +# | ubuntu | 22.04, 24.04, 25.04 25.10 | | # | debian | bullseye-slim, bookworm-slim, trixie-slim | | # | redhatenterprise | 8, 9, 10 | | # | rockylinux | 8, 9, 10 | | # | almalinux | 8, 9, 10 | | -# | alpine | 3.19, 3.20, 3.21 3.22 | | +# | alpine | 3.20, 3.21 3.22 | | # | oraclelinux | 8, 9, 10 | | -# | suse | sle15 | | +# | suse | sle15, sle16 | | # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # OS_RELEASE ?= ubuntu OS_VERSION ?= 24.04 diff --git a/Makefile.packaging b/Makefile.packaging index 9aa1228ce..ecc772059 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -12,13 +12,13 @@ PACKAGE_BUILD ?= 1 PACKAGE_VERSION ?= $(shell echo ${VERSION} | tr -d 'v') TARBALL_NAME := $(PACKAGE_PREFIX).tar.gz -DEB_DISTROS ?= ubuntu-plucky-25.04 ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-trixie-13 debian-bookworm-12 debian-bullseye-11 +DEB_DISTROS ?= ubuntu-questing-25.10 ubuntu-plucky-25.04 ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-trixie-13 debian-bookworm-12 debian-bullseye-11 DEB_ARCHS ?= arm64 amd64 -RPM_DISTROS ?= suse-15-x86_64 +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.18 3.19 3.20 3.21 3.22 +APK_VERSIONS ?= 3.20 3.21 3.22 APK_ARCHS ?= aarch64 x86_64 APK_REVISION ?= 1 AMAZON_VERSIONS ?= amazon-2 amazon-2023 diff --git a/go.mod b/go.mod index 24e3e8cd0..934ae6790 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/nginx/agent/v3 go 1.24.2 -toolchain go1.24.10 +toolchain go1.24.11 require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.9-20250912141014-52f32327d4b0.1 diff --git a/scripts/packages/package-check.sh b/scripts/packages/package-check.sh index 5cb4ba2d4..eec17de8c 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" "3.19") +ALPINE_VERSIONS=("3.22" "3.21" "3.20") ALPINE_ARCH=("x86_64" "aarch64") for alpine_version in "${ALPINE_VERSIONS[@]}"; do for arch in ${ALPINE_ARCH[@]}; do @@ -102,9 +102,11 @@ for arch in ${RPM_ARCH[@]}; do AMZN+=("amzn2/2/${arch}/RPMS/nginx-agent-$VERSION.amzn2.ngx.${arch}.rpm") done -SUSE=( - sles/15/x86_64/RPMS/nginx-agent-$VERSION.sles15.ngx.x86_64.rpm -) +SUSE=() +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 # Aggregate all URIs to fetch uris=(