From 4e2d9ea74afbad93085be9b405bebcbf852aa93e Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Thu, 10 Jul 2025 14:30:50 +0100 Subject: [PATCH 1/4] add new os --- .github/workflows/ci.yml | 4 ++-- Makefile | 12 ++++++------ Makefile.packaging | 13 ++++++------- scripts/packages/package-check.sh | 10 ++++++---- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8340a95cd..3637f3951 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,9 +94,9 @@ jobs: matrix: container: - image: "ubuntu" - version: "24.04" + version: "25.04" - image: "redhatenterprise" - version: "9" + version: "10" - image: "alpine" version: "3.22" steps: diff --git a/Makefile b/Makefile index d27ae81da..bff22f91e 100644 --- a/Makefile +++ b/Makefile @@ -17,13 +17,13 @@ GOBIN ?= $$(go env GOPATH)/bin # | OS_RELEASE | OS_VERSION | NOTES | # | ---------------- | ----------------------------------------- | -------------------------------------------------------------- | # | amazonlinux | 2, 2023 | | -# | ubuntu | 20.04, 22.04 24.04 | | +# | ubuntu | 22.04, 24.04, 24.10, 25.04 | | # | debian | bullseye-slim, bookworm-slim | | -# | redhatenterprise | 8, 9 | | -# | rockylinux | 8, 9 | | -# | almalinux | 8, 9 | | -# | alpine | 3.18, 3.19, 3.20, 3.21 3.22 | | -# | oraclelinux | 8, 9 | | +# | redhatenterprise | 8, 9, 10 | | +# | rockylinux | 8, 9, 10 | | +# | almalinux | 8, 9, 10 | | +# | alpine | 3.19, 3.20, 3.21 3.22 | | +# | oraclelinux | 8, 9, 10 | | # | suse | sle15 | | # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # OS_RELEASE ?= ubuntu diff --git a/Makefile.packaging b/Makefile.packaging index 754e4ed91..6c7a076a6 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -12,19 +12,18 @@ PACKAGE_BUILD ?= 1 PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v') TARBALL_NAME := $(PACKAGE_PREFIX).tar.gz -DEB_DISTROS ?= ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11 +DEB_DISTROS ?= ubuntu-plucky-24.04 ubuntu-oracular-24.10 ubuntu-noble-24.04 ubuntu-jammy-22.04 debian-bookworm-12 debian-bullseye-11 DEB_ARCHS ?= arm64 amd64 -RPM_DISTROS ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-15-x86_64 +RPM_DISTROS ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 oraclelinux-10-x86_64 suse-15-x86_64 RPM_ARCH := x86_64 -REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 +REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10 REDHAT_ARCHS ?= aarch64 x86_64 -ROCKY_VERSIONS ?= rocky-8 rocky-9 +ROCKY_VERSIONS ?= rocky-8 rocky-9 rocky-10 ROCKY_ARCHS ?= aarch64 x86_64 -FREEBSD_DISTROS ?= "FreeBSD:13:amd64" "FreeBSD:14:amd64" -APK_VERSIONS ?= 3.18 3.19 3.20 3.21 3.22 +APK_VERSIONS ?= 3.19 3.20 3.21 3.22 APK_ARCHS ?= aarch64 x86_64 APK_REVISION ?= 1 -ALMA_VERSIONS ?= almalinux-8 almalinux-9 +ALMA_VERSIONS ?= almalinux-8 almalinux-9 almalinux-10 ALMA_ARCHS ?= aarch64 x86_64 AMAZON_VERSIONS ?= amazon-2 amazon-2023 AMAZON_ARCHS ?= aarch64 x86_64 diff --git a/scripts/packages/package-check.sh b/scripts/packages/package-check.sh index 917d8ce91..0f7341367 100755 --- a/scripts/packages/package-check.sh +++ b/scripts/packages/package-check.sh @@ -55,18 +55,18 @@ APK=( alpine/v3.21/main/x86_64/nginx-agent-$VERSION.apk alpine/v3.20/main/aarch64/nginx-agent-$VERSION.apk alpine/v3.20/main/x86_64/nginx-agent-$VERSION.apk - alpine/v3.18/main/aarch64/nginx-agent-$VERSION.apk - alpine/v3.18/main/x86_64/nginx-agent-$VERSION.apk alpine/v3.19/main/aarch64/nginx-agent-$VERSION.apk alpine/v3.19/main/x86_64/nginx-agent-$VERSION.apk ) UBUNTU=( - ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~focal_arm64.deb ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~jammy_amd64.deb ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~noble_arm64.deb + ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~oracular_arm64.deb + ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~plucky_arm64.deb ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~jammy_arm64.deb ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~noble_amd64.deb - ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~focal_amd64.deb + ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~oracular_amd64.deb + ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~plucky_amd64.deb ) DEBIAN=( debian/pool/agent/n/nginx-agent/nginx-agent_$VERSION~bullseye_arm64.deb @@ -85,6 +85,8 @@ SUSE=( sles/15/x86_64/RPMS/nginx-agent-$VERSION.sles15.ngx.x86_64.rpm ) CENTOS=( + centos/10/aarch64/RPMS/nginx-agent-$VERSION.el10.ngx.aarch64.rpm + centos/10/x86_64/RPMS/nginx-agent-$VERSION.el10.ngx.x86_64.rpm centos/9/aarch64/RPMS/nginx-agent-$VERSION.el9.ngx.aarch64.rpm centos/9/x86_64/RPMS/nginx-agent-$VERSION.el9.ngx.x86_64.rpm centos/8/aarch64/RPMS/nginx-agent-$VERSION.el8.ngx.aarch64.rpm From d127cf5f3f201e230239d8be4bc4d9c7ea734b71 Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Fri, 11 Jul 2025 11:51:00 +0100 Subject: [PATCH 2/4] fix packaging --- Makefile.packaging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.packaging b/Makefile.packaging index 6c7a076a6..157f98881 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -12,7 +12,7 @@ PACKAGE_BUILD ?= 1 PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v') TARBALL_NAME := $(PACKAGE_PREFIX).tar.gz -DEB_DISTROS ?= ubuntu-plucky-24.04 ubuntu-oracular-24.10 ubuntu-noble-24.04 ubuntu-jammy-22.04 debian-bookworm-12 debian-bullseye-11 +DEB_DISTROS ?= ubuntu-plucky-25.04 ubuntu-oracular-24.10 ubuntu-noble-24.04 ubuntu-jammy-22.04 debian-bookworm-12 debian-bullseye-11 DEB_ARCHS ?= arm64 amd64 RPM_DISTROS ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 oraclelinux-10-x86_64 suse-15-x86_64 RPM_ARCH := x86_64 From 9382469a557a5bd2ba6af3d71354531c22fd77e0 Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Mon, 14 Jul 2025 16:15:57 +0100 Subject: [PATCH 3/4] undo pipelines changes --- .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 3637f3951..8340a95cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,9 +94,9 @@ jobs: matrix: container: - image: "ubuntu" - version: "25.04" + version: "24.04" - image: "redhatenterprise" - version: "10" + version: "9" - image: "alpine" version: "3.22" steps: From 6f246c414c95c7d76cd3ba507ea4c328b1b97ee1 Mon Sep 17 00:00:00 2001 From: Aphral Griffin Date: Tue, 15 Jul 2025 10:19:29 +0100 Subject: [PATCH 4/4] clean up --- Makefile | 2 +- Makefile.packaging | 2 +- scripts/packages/package-check.sh | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 639539ab2..9df9dcca7 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ GOBIN ?= $$(go env GOPATH)/bin # | OS_RELEASE | OS_VERSION | NOTES | # | ---------------- | ----------------------------------------- | -------------------------------------------------------------- | # | amazonlinux | 2, 2023 | | -# | ubuntu | 22.04, 24.04, 24.10, 25.04 | | +# | ubuntu | 22.04, 24.04 25.04 | | # | debian | bullseye-slim, bookworm-slim | | # | redhatenterprise | 8, 9, 10 | | # | rockylinux | 8, 9, 10 | | diff --git a/Makefile.packaging b/Makefile.packaging index d89fddf77..74b6f336f 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -12,7 +12,7 @@ PACKAGE_BUILD ?= 1 PACKAGE_VERSION := $(shell git describe --match "v[0-9]*" --abbrev=0 --tags) TARBALL_NAME := $(PACKAGE_PREFIX).tar.gz -DEB_DISTROS ?= ubuntu-plucky-25.04 ubuntu-oracular-24.10 ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11 +DEB_DISTROS ?= ubuntu-plucky-25.04 ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11 DEB_ARCHS ?= arm64 amd64 RPM_DISTROS ?= suse-15-x86_64 RPM_ARCH := x86_64 diff --git a/scripts/packages/package-check.sh b/scripts/packages/package-check.sh index 0f7341367..c3610b56a 100755 --- a/scripts/packages/package-check.sh +++ b/scripts/packages/package-check.sh @@ -61,11 +61,9 @@ APK=( UBUNTU=( ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~jammy_amd64.deb ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~noble_arm64.deb - ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~oracular_arm64.deb - ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~plucky_arm64.deb + ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~plucky_arm64.deb ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~jammy_arm64.deb ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~noble_amd64.deb - ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~oracular_amd64.deb ubuntu/pool/agent/n/nginx-agent/nginx-agent_$VERSION~plucky_amd64.deb ) DEBIAN=(