Merge pull request 'chore(revert): fix: alternative route of getting latest Gitea version' (#636) from limiting-factor/end-to-end:wip-gitea into main

Reviewed-on: https://code.forgejo.org/forgejo/end-to-end/pulls/636
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>

.forgejo/workflows/gitea-upgrade.yml

@@ -1,36 +0,0 @@
-#
-#
-# https://code.forgejo.org/forgejo/end-to-end/settings/actions
-#
-# secrets.MIRROR_TOKEN_GITEA
-#   https://code.forgejo.org/forgejo-mirror scope read:repository
-#
-
-on:
-  pull_request_target:
-  push:
-    branches:
-      - 'main'
-      - 'wip-gitea'
-
-jobs:
-  gitea_upgrade:
-    name: gitea upgrade
-    runs-on: lxc-bookworm
-    steps:
-      - uses: https://data.forgejo.org/actions/checkout@v4
-      - name: prepare upload
-        run: |
-          mkdir -p /tmp/forgejo-upload
-          touch /tmp/forgejo-upload/PLACEHOLDER
-      - uses: actions/upload-artifact@v3
-        with:
-          name: forgejo-dev
-          path: /tmp/forgejo-upload
-      - uses: ./.forgejo/prepare-end-to-end
-      - name: gitea upgrades
-        run: |
-            su forgejo -c "./end-to-end.sh test_gitea_upgrades ${{ secrets.MIRROR_TOKEN_GITEA }}"
-      - name: full logs
-        if: always()
-        run: su forgejo -c "./end-to-end.sh show_logs"

lib/lib.sh

@@ -141,16 +141,13 @@ function download_forgejo() {
     fi
 }
 
-: ${GITEA_AUTHORIZATION_HEADER:=}
-
 function download_gitea() {
     local version=$1
 
     if ! test -f $DIR_BINARIES/gitea-$version; then
         mkdir -p $DIR_BINARIES
         if [[ $version =~ ^[0-9]+\.[0-9]+$ ]]; then
-            full_version=$(curl -sS -H "$GITEA_AUTHORIZATION_HEADER" "https://code.forgejo.org/api/v1/repos/gitea/gitea/tags" | jq -r '.[] | .name | select(startswith("v'$version'"))' | grep -v -e '-rc' | sort --reverse --version-sort | head -1)
-            full_version=${full_version#v}
+            full_version=$(git ls-remote --refs --tags --sort=version:refname https://git-mirror.forgejo.org/go-gitea/gitea "v$version*" | sed -n -E -e "s|^.*/v($version[\.0-9]*)$|\1|p" | tail -1)
         else
             full_version=$version
         fi

upgrade/upgrade.sh

@@ -69,11 +69,6 @@ function migration_assert() {
 }
 
 function test_gitea_upgrades() {
-    local token="$1"
-    GITEA_AUTHORIZATION_HEADER="Authorization: token $token"
-
-    run dependencies
-
     local config=$UPGRADE_DIR/default-app.ini
     # The Forgejo target migration version must be 10.0 because it is the last supported.
     # https://forgejo.org/2024-12-gitea-compatibility/
@@ -111,4 +106,5 @@ function test_upgrades() {
 
     run test_successful_upgrades
     run test_forgejo_pprof
+    run test_gitea_upgrades
 }