From 4a6ed59cb6b55718f60084225927c422aaf639bd Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sat, 6 Apr 2024 09:33:34 +0200
Subject: [PATCH 1/3] logs: show logs, not just the .out files

---
 lib/lib.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/lib.sh b/lib/lib.sh
index 86251fc..0eaf5ed 100644
--- a/lib/lib.sh
+++ b/lib/lib.sh
@@ -296,7 +296,10 @@ function stop() {
 function show_logs() {
     (
 	cd $DIR
-	grep '' *.out
+	set +e
+        grep --text '' *.log
+        grep --text '' forgejo-work-path/log/*.log
+	grep --text '' *.out
     )
 }
 
-- 
2.43.4


From 5640058c216750c03890bcd1044696be3d7b666e Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sat, 6 Apr 2024 15:38:23 +0200
Subject: [PATCH 2/3] logs: always prefix with the file name

otherwise it is difficult to figure out where the runner logs end and
where the forgejo logs start.
---
 lib/lib.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/lib.sh b/lib/lib.sh
index 0eaf5ed..12a5d90 100644
--- a/lib/lib.sh
+++ b/lib/lib.sh
@@ -297,9 +297,9 @@ function show_logs() {
     (
 	cd $DIR
 	set +e
-        grep --text '' *.log
-        grep --text '' forgejo-work-path/log/*.log
-	grep --text '' *.out
+        grep --with-filename --text '' *.log
+        grep --with-filename --text '' forgejo-work-path/log/*.log
+	grep --with-filename --text '' *.out
     )
 }
 
-- 
2.43.4


From d8d0ead3875c25b24f08ec936a5be860f75280b7 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sat, 6 Apr 2024 16:15:12 +0200
Subject: [PATCH 3/3] temporarily skip 8.0-test

because 7.0-dev contains a migration that is ahead of 8.0 which should
not happen but does today because a PR was backported. The last one.
---
 lib/lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lib.sh b/lib/lib.sh
index 12a5d90..978d72f 100644
--- a/lib/lib.sh
+++ b/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="7.0 7.0-dev 8.0-dev"
 ORGANIZATIONS=$(cat $LIB_DIR/ORGANIZATIONS)
 
 function log_info() {
-- 
2.43.4