.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

.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
+            owner: forgejo-experimental
-          - version: 1.21
+          - 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
@@ -121,22 +121,11 @@ jobs:
     needs: [build]
     runs-on: lxc-bookworm
     steps:
-      - name: cache S3 binaries
+      - uses: https://code.forgejo.org/actions/checkout@v4
-        id: S3
+      - uses: ./.forgejo/prepare-end-to-end
-        uses: https://code.forgejo.org/actions/cache@v3
-        with:
-          path: |
-            /usr/local/bin/minio
-            /usr/local/bin/mc
-            /usr/local/bin/garage
-          key: S3
-
       - 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