From b83c2852b8b0698c73d8e7c4b9fd522010e4aa66 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sun, 15 Dec 2024 10:19:29 +0900 Subject: [PATCH] Upgrade CI to Alpine 3.21 (#2620) --- .github/workflows/ci.yml | 2 +- .github/workflows/linux-ci-helper.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fae0cadf0..ea712e5b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: - fedora:41 - fedora:40 - opensuse/leap:15 - - alpine:3.20 + - alpine:3.21 container: image: ${{ matrix.container }} diff --git a/.github/workflows/linux-ci-helper.sh b/.github/workflows/linux-ci-helper.sh index 103487720..b64a8fa35 100755 --- a/.github/workflows/linux-ci-helper.sh +++ b/.github/workflows/linux-ci-helper.sh @@ -198,7 +198,7 @@ elif [ "${CONTAINER_FULLNAME}" = "opensuse/leap:15" ]; then INSTALL_CHECKER_PKGS="cppcheck ShellCheck" INSTALL_CHECKER_PKG_OPTIONS="" -elif [ "${CONTAINER_FULLNAME}" = "alpine:3.20" ]; then +elif [ "${CONTAINER_FULLNAME}" = "alpine:3.21" ]; then PACKAGE_MANAGER_BIN="apk" PACKAGE_UPDATE_OPTIONS="update --no-progress" PACKAGE_INSTALL_OPTIONS="add --no-progress --no-cache"