Merge pull request 'feat: use alpine 3.21 and forgejo 10.0' (#478) from earl-warren/end-to-end:wip-packages into main

Reviewed-on: https://code.forgejo.org/forgejo/end-to-end/pulls/478
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
earl-warren 2025-01-13 06:28:56 +00:00
commit 37572630e8
3 changed files with 6 additions and 6 deletions

View file

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

View file

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