lib/lib.sh

@@ -34,7 +34,7 @@ export DOT_FORGEJO_CURL=$DIR/forgejo-curl
 export DOT=$DOT_FORGEJO_CURL # for backward compatibility with forgejo-curl.sh 1.0.0
 : ${FORGEJO_USER:=root}
 : ${FORGEJO_PASSWORD:=admin1234}
-RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done)"
+RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r-dev $r ; done)"
 ORGANIZATIONS=$(cat $LIB_DIR/ORGANIZATIONS)
 
 function log_info() {

packages/alpine-7.0-dev

@@ -1 +1 @@
-alpine-7.0-test
+alpine-7.0

packages/alpine.sh

@@ -17,7 +17,7 @@ function test_packages_alpine_version() {
 
 function test_packages_alpine() {
     for alpine_version in 3.18 3.19 ; do
-	for forgejo_version in 1.21 7.0-test 7.0-dev ; do
+	for forgejo_version in 1.21 $RELEASE_NUMBERS_AND_DEV ; do
 	    test_packages_alpine_version $alpine_version $forgejo_version
 	done
     done

upgrade/upgrade.sh

@@ -38,7 +38,7 @@ function test_successful_upgrades() {
 	fixture_assert
 	doctor_run $version
 
-        for version in 1.19 1.20 1.21 $RELEASE_NUMBERS_AND_DEV ; do
+        for version in 1.19 1.20 1.21 $(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done) ; do
             stop
             log_info "run $version"
             start $version