From 8d8994f7ea4870f6c4064fb3eceda4becb6b6f48 Mon Sep 17 00:00:00 2001
From: Twenty Panda <twenty-panda@posteo.com>
Date: Wed, 20 Mar 2024 14:29:54 +0100
Subject: [PATCH 1/2] always cache minio & garage binaries

they are sometime very slow to download and it does not help to do it
five times for each workflow
---
 .forgejo/prepare-end-to-end/action.yml | 10 ++++++++++
 .forgejo/workflows/end-to-end.yml      | 15 ++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.forgejo/prepare-end-to-end/action.yml b/.forgejo/prepare-end-to-end/action.yml
index d94a09a..0fa2794 100644
--- a/.forgejo/prepare-end-to-end/action.yml
+++ b/.forgejo/prepare-end-to-end/action.yml
@@ -1,6 +1,16 @@
 runs:
   using: "composite"
   steps:
+      - name: cache S3 binaries
+        id: S3
+        uses: https://code.forgejo.org/actions/cache@v3
+        with:
+          path: |
+            /usr/local/bin/minio
+            /usr/local/bin/mc
+            /usr/local/bin/garage
+          key: S3
+
       - uses: https://code.forgejo.org/actions/setup-forgejo@v2
         with:
           install-only: true
diff --git a/.forgejo/workflows/end-to-end.yml b/.forgejo/workflows/end-to-end.yml
index e90c791..e90609f 100644
--- a/.forgejo/workflows/end-to-end.yml
+++ b/.forgejo/workflows/end-to-end.yml
@@ -121,22 +121,11 @@ jobs:
     needs: [build]
     runs-on: lxc-bookworm
     steps:
-      - name: cache S3 binaries
-        id: S3
-        uses: https://code.forgejo.org/actions/cache@v3
-        with:
-          path: |
-            /usr/local/bin/minio
-            /usr/local/bin/mc
-            /usr/local/bin/garage
-          key: S3
-
+      - 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
-
-      - uses: https://code.forgejo.org/actions/checkout@v4
-      - uses: ./.forgejo/prepare-end-to-end
       - run: su forgejo -c "./end-to-end.sh test_upgrades"
       - run: su forgejo -c "./end-to-end.sh test_storage"
       - name: full logs

From 473c9820c9ff3f8201d61d89ba68381eb9c16c72 Mon Sep 17 00:00:00 2001
From: Twenty Panda <twenty-panda@posteo.com>
Date: Wed, 20 Mar 2024 14:34:34 +0100
Subject: [PATCH 2/2] versions must be strings

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

diff --git a/.forgejo/workflows/end-to-end.yml b/.forgejo/workflows/end-to-end.yml
index e90609f..a95cde4 100644
--- a/.forgejo/workflows/end-to-end.yml
+++ b/.forgejo/workflows/end-to-end.yml
@@ -80,13 +80,13 @@ jobs:
     strategy:
       matrix:
         info:
-          - version: 7.0
+          - version: "7.0"
             branch: next
             forgejo: https://codeberg.org
-            repo: forgejo-experimental/forgejo
-          - version: 1.21
+            owner: forgejo-experimental
+          - version: "1.21"
             forgejo: https://codeberg.org
-            repo: forgejo/forgejo
+            owner: forgejo
     steps:
       - uses: https://code.forgejo.org/actions/checkout@v4
       - uses: ./.forgejo/prepare-end-to-end
@@ -95,7 +95,7 @@ jobs:
         shell: bash
         run: |
           set -x
-          full_version=$(./end-to-end.sh full_version ${{ matrix.info.version }})
+          full_version=$(./end-to-end.sh full_version ${{ matrix.info.version }} ${{ matrix.info.owner }})
           echo value="$full_version" >> $GITHUB_OUTPUT
       - run: su forgejo -c "./end-to-end.sh test_actions ${{ matrix.info.version }}"
       - name: update documentation