From f4c266f6b2ca4ac91b46ec435f52965ec29dddc9 Mon Sep 17 00:00:00 2001
From: Twenty Panda <twenty-panda@posteo.com>
Date: Wed, 20 Mar 2024 19:44:00 +0100
Subject: [PATCH 1/3] actions: add step to show logs

---
 .forgejo/workflows/end-to-end.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.forgejo/workflows/end-to-end.yml b/.forgejo/workflows/end-to-end.yml
index a95cde4..32ec58b 100644
--- a/.forgejo/workflows/end-to-end.yml
+++ b/.forgejo/workflows/end-to-end.yml
@@ -72,6 +72,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/prepare-end-to-end
       - run: su forgejo -c "./end-to-end.sh test_actions"
+      - name: full logs
+        if: always()
+        run: su forgejo -c "./end-to-end.sh show_logs"
 
   actions-docs:
     needs: [build]

From 4e517fb4df12c32bb9b0c9ab69ea4e24ab153a07 Mon Sep 17 00:00:00 2001
From: Twenty Panda <twenty-panda@posteo.com>
Date: Wed, 20 Mar 2024 19:44:15 +0100
Subject: [PATCH 2/3] outputs do not cross local actions

---
 .forgejo/workflows/end-to-end.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.forgejo/workflows/end-to-end.yml b/.forgejo/workflows/end-to-end.yml
index 32ec58b..5663d0d 100644
--- a/.forgejo/workflows/end-to-end.yml
+++ b/.forgejo/workflows/end-to-end.yml
@@ -126,9 +126,6 @@ jobs:
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/prepare-end-to-end
-      - name: skip if S3 cache hit
-        if: steps.S3.outputs.cache-hit != 'true'
-        run: echo no hit
       - run: su forgejo -c "./end-to-end.sh test_upgrades"
       - run: su forgejo -c "./end-to-end.sh test_storage"
       - name: full logs

From 02d263e21245fa88e8bc10186e3b8bc1e44104eb Mon Sep 17 00:00:00 2001
From: Twenty Panda <twenty-panda@posteo.com>
Date: Wed, 20 Mar 2024 19:49:21 +0100
Subject: [PATCH 3/3] lib: ORGANIZATIONS ordered list

they determine the order in which Forgejo binaries will be looked
up. It is moved to a file so it can be overriden to change the order.
---
 lib/ORGANIZATIONS | 1 +
 lib/lib.sh        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 lib/ORGANIZATIONS

diff --git a/lib/ORGANIZATIONS b/lib/ORGANIZATIONS
new file mode 100644
index 0000000..8c8989a
--- /dev/null
+++ b/lib/ORGANIZATIONS
@@ -0,0 +1 @@
+forgejo forgejo-experimental forgejo-integration
diff --git a/lib/lib.sh b/lib/lib.sh
index 853a4f2..2d1be2e 100644
--- a/lib/lib.sh
+++ b/lib/lib.sh
@@ -35,6 +35,7 @@ export DOT=$DOT_FORGEJO_CURL # for backward compatibility with forgejo-curl.sh 1
 : ${FORGEJO_USER:=root}
 : ${FORGEJO_PASSWORD:=admin1234}
 RELEASE_NUMBERS_AND_DEV="$(for r in $RELEASE_NUMBERS ; do echo -n $r $r-dev ; done)"
+ORGANIZATIONS=$(cat $LIB_DIR/ORGANIZATIONS)
 
 function log_info() {
     echo "$PREFIX $@"
@@ -116,7 +117,7 @@ function download() {
 
     if ! test -f $DIR_BINARIES/forgejo-$version ; then
         mkdir -p $DIR_BINARIES
-	for owner in forgejo forgejo-experimental forgejo-integration ; do
+	for owner in $ORGANIZATIONS ; do
 	    full_version=$(full_version $version $owner)
 	    if test "$full_version" = "" ; then
 		continue