From 5b5dab8c13aad6145ffb6f4ca4c5ff4bc95ad6f5 Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Fri, 9 May 2025 12:22:45 +0200 Subject: [PATCH] chore(revert): fix: alternative route of getting latest Gitea version Revert 53375283d4e23ddc55a08d3b506ffcdcedc5c603 fix: alternative route of getting latest Gitea version Use git ls-remote and git-mirror instead of the API $ version=1.23 $ 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" 1.23.0 1.23.1 1.23.2 1.23.3 1.23.4 1.23.5 1.23.6 1.23.7 --- .forgejo/workflows/gitea-upgrade.yml | 36 ---------------------------- lib/lib.sh | 5 +--- upgrade/upgrade.sh | 6 +---- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 .forgejo/workflows/gitea-upgrade.yml diff --git a/.forgejo/workflows/gitea-upgrade.yml b/.forgejo/workflows/gitea-upgrade.yml deleted file mode 100644 index fe1bc458..00000000 --- a/.forgejo/workflows/gitea-upgrade.yml +++ /dev/null @@ -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" diff --git a/lib/lib.sh b/lib/lib.sh index 1cc9addf..1130a5bd 100644 --- a/lib/lib.sh +++ b/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 diff --git a/upgrade/upgrade.sh b/upgrade/upgrade.sh index 7ef854f0..29142499 100755 --- a/upgrade/upgrade.sh +++ b/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 }