From 03aebc4b0f9bbe80db8c1521541a66315c3545b6 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Wed, 20 Mar 2024 20:20:42 +0100
Subject: [PATCH] [CI] simplify running end-to-end tests while building a
 release

---
 .forgejo/cascading-release-end-to-end | 12 +++++++++++-
 .forgejo/workflows/build-release.yml  |  4 +---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.forgejo/cascading-release-end-to-end b/.forgejo/cascading-release-end-to-end
index 7b43c89ed..08ad8a443 100755
--- a/.forgejo/cascading-release-end-to-end
+++ b/.forgejo/cascading-release-end-to-end
@@ -9,4 +9,14 @@ forgejo_ref=$4
 
 cd $end_to_end
 date > last-upgrade
-echo $FORGEJO_BINARY > forgejo/binary-url
+organizations=lib/ORGANIZATIONS
+if ! test -f $organizations ; then
+    echo "$organizations file not found"
+    false
+fi
+#
+# do not include forgejo-experimental so that 7.0-test is found
+# in forgejo-integration where it was just built instead of
+# forgejo-experimental which was published by the previous build
+#
+echo forgejo forgejo-integration > $organizations
diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml
index c012991b3..19423205a 100644
--- a/.forgejo/workflows/build-release.yml
+++ b/.forgejo/workflows/build-release.yml
@@ -203,11 +203,9 @@ jobs:
           destination-url: https://code.forgejo.org
           destination-fork-repo: ${{ vars.CASCADE_DESTINATION_DOER }}/end-to-end
           destination-repo: forgejo/end-to-end
-          destination-branch: forgejo-pr
+          destination-branch: main
           destination-token: ${{ secrets.CASCADE_DESTINATION_TOKEN }}
           update: .forgejo/cascading-release-end-to-end
-        env:
-          FORGEJO_BINARY: "${{ env.GITHUB_SERVER_URL }}/${{ github.repository }}/releases/download/v${{ steps.release-info.outputs.version }}/forgejo-${{ steps.release-info.outputs.version }}-linux-amd64"
 
       - name: copy to experimental
         if: vars.ROLE == 'forgejo-integration' && secrets.TOKEN != ''