Skip to content

Merge release-3.6.1 back into main #1458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sean-breen merged 2 commits into from
Dec 16, 2025
Merged

Merge release-3.6.1 back into main #1458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17fbae9
[V3] Add support for Alpine 3.23 (#1441)
sean-breen Dec 15, 2025
f4a3c33
Fix typo in package check (#1459)
sean-breen Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Expand Down
2 changes: 1 addition & 1 deletion Makefile.packaging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions scripts/packages/package-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading