Merge pull request #1458 from nginx/release-3.6.1

Merge release-3.6.1 back into main

Author: sean-breen

.github/workflows/ci.yml

@@ -196,7 +196,7 @@ jobs:
         - image: "redhatenterprise"
           version: "9"
         - image: "alpine"
-          version: "3.22"
+          version: "3.23"
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Configure Go Proxy

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                           	 |                                                                |
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

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

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