From 135bd00a26101cd317720584b31ed1562f3b6d89 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 13 Jan 2025 05:34:29 +0100 Subject: [PATCH] feat: use alpine 3.21 and forgejo 10.0 and no longer alpine 3.19 and forgejo 9.0 --- packages/{alpine-9.0 => alpine-10.0} | 0 packages/alpine-7.0/test.sh | 6 +++--- packages/alpine.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) rename packages/{alpine-9.0 => alpine-10.0} (100%) diff --git a/packages/alpine-9.0 b/packages/alpine-10.0 similarity index 100% rename from packages/alpine-9.0 rename to packages/alpine-10.0 diff --git a/packages/alpine-7.0/test.sh b/packages/alpine-7.0/test.sh index d830df2..4676e7c 100755 --- a/packages/alpine-7.0/test.sh +++ b/packages/alpine-7.0/test.sh @@ -41,7 +41,7 @@ for file in $(find . -name '*.apk' -type f | sed -e 's,./,,'); do --fail \ -H "Authorization: token $forgejo_token" \ -X DELETE \ - "$forgejo_url/api/packages/root/alpine/3.19/e2e-tests/$file" || + "$forgejo_url/api/packages/root/alpine/3.21/e2e-tests/$file" || true # upload new package @@ -49,13 +49,13 @@ for file in $(find . -name '*.apk' -type f | sed -e 's,./,,'); do --fail \ -H "Authorization: token $forgejo_token" \ -T "$file" \ - "$forgejo_url/api/packages/root/alpine/3.19/e2e-tests" + "$forgejo_url/api/packages/root/alpine/3.21/e2e-tests" done # ensure that the install-if condition works as expected apk add openrc (cd /etc/apk/keys && curl -JO $forgejo_url/api/packages/root/alpine/key) -echo "$forgejo_url/api/packages/root/alpine/3.19/e2e-tests" >>/etc/apk/repositories +echo "$forgejo_url/api/packages/root/alpine/3.21/e2e-tests" >>/etc/apk/repositories apk add forgejo-2174 forgejo-2173 [ -e /usr/bin/forgejo_2174 ] # from the installed package [ -e /usr/bin/forgejo_2173 ] # from the installed package diff --git a/packages/alpine.sh b/packages/alpine.sh index 4ae92ae..59bc0c6 100644 --- a/packages/alpine.sh +++ b/packages/alpine.sh @@ -1,4 +1,4 @@ -# Copyright 2024 The Forgejo Authors +# Copyright 2025 The Forgejo Authors # SPDX-License-Identifier: MIT function test_packages_alpine_version() { @@ -16,8 +16,8 @@ function test_packages_alpine_version() { } function test_packages_alpine() { - for alpine_version in 3.19 3.20; do - for forgejo_version in 7.0 9.0; do + for alpine_version in 3.20 3.21; do + for forgejo_version in 7.0 10.0; do test_packages_alpine_version $alpine_version $forgejo_version done done