Merge pull request 'chore(ci): optimize end-to-end runs [skip ci]' (#4888) from wip-ci-end-to-end into forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4888
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
Earl Warren 2024-08-08 20:24:10 +00:00
commit 7ac390bcb4
2 changed files with 22 additions and 21 deletions

View file

@ -13,21 +13,22 @@ minor_version=$(make show-version-minor)
cd $end_to_end cd $end_to_end
if ! test -f forgejo/sources/$minor_version ; then if ! test -f forgejo/sources/$minor_version; then
echo "FAIL: forgejo/sources/$minor_version does not exist in the end-to-end repository" echo "FAIL: forgejo/sources/$minor_version does not exist in the end-to-end repository"
false false
fi fi
date > last-upgrade echo -n $minor_version >forgejo/build-from-sources
date >last-upgrade
if test -f "$forgejo_pr_or_ref" ; then if test -f "$forgejo_pr_or_ref"; then
forgejo_pr=$forgejo_pr_or_ref forgejo_pr=$forgejo_pr_or_ref
head_url=$(jq --raw-output .head.repo.html_url < $forgejo_pr) head_url=$(jq --raw-output .head.repo.html_url <$forgejo_pr)
test "$head_url" != null test "$head_url" != null
branch=$(jq --raw-output .head.ref < $forgejo_pr) branch=$(jq --raw-output .head.ref <$forgejo_pr)
test "$branch" != null test "$branch" != null
echo $head_url $branch $full_version > forgejo/sources/$minor_version echo $head_url $branch $full_version >forgejo/sources/$minor_version
else else
forgejo_ref=$forgejo_pr_or_ref forgejo_ref=$forgejo_pr_or_ref
echo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY ${forgejo_ref#refs/heads/} $full_version > forgejo/sources/$minor_version echo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY ${forgejo_ref#refs/heads/} $full_version >forgejo/sources/$minor_version
fi fi

View file

@ -8,15 +8,15 @@ forgejo=$3
forgejo_ref=$4 forgejo_ref=$4
cd $end_to_end cd $end_to_end
date > last-upgrade date >last-upgrade
organizations=lib/ORGANIZATIONS organizations=lib/ORGANIZATIONS
if ! test -f $organizations ; then if ! test -f $organizations; then
echo "$organizations file not found" echo "$organizations file not found"
false false
fi fi
# #
# do not include forgejo-experimental so that 7.0-test is found # Inverse the order of lookup because the goal in the release built
# in forgejo-integration where it was just built instead of # pipeline is to test the latest build, if available, instead of the
# forgejo-experimental which was published by the previous build # stable version by the same version.
# #
echo forgejo forgejo-integration > $organizations echo forgejo-integration forgejo-experimental forgejo >$organizations