From be86fe2e445261f781098cf76880e31b0c05a5bf Mon Sep 17 00:00:00 2001
From: Twenty Panda <twenty-panda@posteo.com>
Date: Thu, 14 Mar 2024 16:07:40 +0700
Subject: [PATCH] upgrade: RELEASE_NUMBERS is a variable with all known
 releases

the development branch is not build for v1.21 & v1.20 because they
pre-date the hard fork and near EOL
---
 forgejo/build.sh                 | 18 +++++++++++-------
 forgejo/sources/1.20             |  1 -
 forgejo/sources/1.21             |  1 -
 forgejo/upgrades/test-upgrade.sh | 16 ++++++++++++----
 4 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 100644 forgejo/sources/1.20
 delete mode 100644 forgejo/sources/1.21

diff --git a/forgejo/build.sh b/forgejo/build.sh
index 6d66576..e0330e8 100755
--- a/forgejo/build.sh
+++ b/forgejo/build.sh
@@ -12,18 +12,22 @@ DIR=$2
 v=$(echo $version | sed -E -e 's/^([0-9]+\.[0-9]+).*/\1/')
 read url ref semver < $SELF_DIR/sources/$v
 
-rm -fr $DIR/src
-if [[ "$ref" =~ ^refs/ ]] ; then
-    git clone --depth 1 $url $DIR/src
+if ! test -d $DIR/src ; then
+    mkdir -p $DIR/src
     cd $DIR/src
-    git fetch origin +$ref:$ref
-    git checkout -b $v $ref
+    git init
+    git remote add origin $url
 else
-    git clone --depth 1 -b $ref $url $DIR/src
     cd $DIR/src
 fi
 
+if ! [[ "$ref" =~ ^refs/ ]] ; then
+    ref=refs/heads/$ref
+fi
+git fetch --update-head-ok origin +$ref:$ref
+git switch --force-create $v $ref
+
 export TAGS="bindata sqlite sqlite_unlock_notify" FORGEJO_VERSION=$semver
 make deps-backend backend
 make generate forgejo
-mv forgejo $DIR/forgejo-$version
+cp -a forgejo $DIR/forgejo-$v-dev
diff --git a/forgejo/sources/1.20 b/forgejo/sources/1.20
deleted file mode 100644
index 3539e49..0000000
--- a/forgejo/sources/1.20
+++ /dev/null
@@ -1 +0,0 @@
-https://codeberg.org/forgejo/forgejo v1.20/forgejo 5.0.0+0-gitea-1.20.0
diff --git a/forgejo/sources/1.21 b/forgejo/sources/1.21
deleted file mode 100644
index fc1869a..0000000
--- a/forgejo/sources/1.21
+++ /dev/null
@@ -1 +0,0 @@
-https://codeberg.org/forgejo/forgejo v1.21/forgejo 6.0.0+0-gitea-1.21.0
diff --git a/forgejo/upgrades/test-upgrade.sh b/forgejo/upgrades/test-upgrade.sh
index 067e7e9..77458d1 100755
--- a/forgejo/upgrades/test-upgrade.sh
+++ b/forgejo/upgrades/test-upgrade.sh
@@ -11,6 +11,11 @@
 # Everything happens in /tmp/forgejo-upgrades
 #
 
+#
+# Forgejo releases for which a branch exists (7.0/forgejo etc.)
+#
+RELEASE_NUMBERS="7.0"
+
 PREFIX===============
 HOST_PORT=0.0.0.0:3000
 STORAGE_PATHS="attachments avatars lfs packages repo-archive repo-avatars"
@@ -26,6 +31,7 @@ SELF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 : ${FORGEJO_USER:=root}
 : ${FORGEJO_REPO:=fixture}
 : ${FORGEJO_PASSWORD:=admin1234}
+RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done)"
 
 source $SELF_DIR/fixtures.sh
 
@@ -65,8 +71,10 @@ function dependencies() {
 }
 
 function build_all() {
-    log_info 7.0.0-dev
-    $SELF_DIR/../build.sh 7.0.0-dev $DIR
+    for dev in $RELEASE_NUMBERS ; do
+	log_info $dev-dev
+	$SELF_DIR/../build.sh $dev $DIR
+    done
 }
 
 function retry() {
@@ -500,7 +508,7 @@ function test_storage_stable_s3() {
 
     log_info "See also https://codeberg.org/forgejo/forgejo/issues/1338"
 
-    for version in 1.18 1.19 1.20.2-0 1.20.3-0 1.20 1.21 7.0 ; do
+    for version in 1.18 1.19 1.20.2-0 1.20.3-0 1.20 1.21 $RELEASE_NUMBERS_AND_DEV ; do
         log_info "Forgejo $version & $s3_backend"
         stop
         reset stable-s3
@@ -564,7 +572,7 @@ function test_successful_upgrades() {
         log_info "using $config app.ini"
         reset $config
 
-        for version in 1.18 1.19 1.20.2-0 1.20.3-0 1.20 1.21 7.0 ; do
+        for version in 1.18 1.19 1.20.2-0 1.20.3-0 1.20 1.21 $RELEASE_NUMBERS_AND_DEV ; do
             log_info "run $version"
             cleanup_storage
             start $version