Skip to content

Commit 6121168

Browse files
committed
Merge branch 'main' into az-migration
2 parents 568cf14 + 079ebdb commit 6121168

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226
- image: "redhatenterprise"
227227
version: "9"
228228
- image: "alpine"
229-
version: "3.22"
229+
version: "3.23"
230230
steps:
231231
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
232232
- name: Get Secrets from Azure Key Vault

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GOBIN ?= $$(go env GOPATH)/bin
2222
# | redhatenterprise | 8, 9, 10 | |
2323
# | rockylinux | 8, 9, 10 | |
2424
# | almalinux | 8, 9, 10 | |
25-
# | alpine | 3.20, 3.21 3.22 | |
25+
# | alpine | 3.20, 3.21 3.22 3.23 | |
2626
# | oraclelinux | 8, 9, 10 | |
2727
# | suse | sle15, sle16 | |
2828
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

Makefile.packaging

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RPM_DISTROS ?= suse-15-x86_64 suse-16-x86_64
1818
RPM_ARCH := x86_64
1919
REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10
2020
REDHAT_ARCHS ?= aarch64 x86_64
21-
APK_VERSIONS ?= 3.20 3.21 3.22
21+
APK_VERSIONS ?= 3.20 3.21 3.22 3.23
2222
APK_ARCHS ?= aarch64 x86_64
2323
APK_REVISION ?= 1
2424
AMAZON_VERSIONS ?= amazon-2 amazon-2023

scripts/packages/package-check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ majorVersion=$(echo ${VERSION} | cut -d. -f1)
6262
# Define package URIs to check for each platform
6363

6464
APK=()
65-
ALPINE_VERSIONS=("3.22" "3.21" "3.20")
65+
ALPINE_VERSIONS=("3.23" "3.22" "3.21" "3.20")
6666
ALPINE_ARCH=("x86_64" "aarch64")
6767
for alpine_version in "${ALPINE_VERSIONS[@]}"; do
6868
for arch in ${ALPINE_ARCH[@]}; do

0 commit comments

Comments
 (0)