From 44a3ba1fcfdbf9c391805bba7bd1bf0756942f6a Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Tue, 7 Nov 2023 13:33:48 +0100
Subject: [PATCH] [CI] end to end tests (squash) use cascading-pr/end-to-end

(cherry picked from commit 8cad18b6bfae62718f3517ce4a4a6a08efafac5e)
---
 .forgejo/cascading-pr-end-to-end                | 3 ++-
 .forgejo/workflows/cascade-setup-end-to-end.yml | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.forgejo/cascading-pr-end-to-end b/.forgejo/cascading-pr-end-to-end
index 2cc63987a0..a2950664ae 100755
--- a/.forgejo/cascading-pr-end-to-end
+++ b/.forgejo/cascading-pr-end-to-end
@@ -4,7 +4,8 @@ set -ex
 
 end_to_end=$1
 end_to_end_pr=$2
-forgejo_pr=$3
+forgejo=$3
+forgejo_pr=$4
 
 url=$(jq --raw-output .head.repo.html_url < $forgejo_pr)
 test "$url" != null
diff --git a/.forgejo/workflows/cascade-setup-end-to-end.yml b/.forgejo/workflows/cascade-setup-end-to-end.yml
index a7da5c3b3d..e88c1df923 100644
--- a/.forgejo/workflows/cascade-setup-end-to-end.yml
+++ b/.forgejo/workflows/cascade-setup-end-to-end.yml
@@ -29,7 +29,9 @@ jobs:
           origin-token: ${{ secrets.END_TO_END_CASCADING_PR_ORIGIN }}
           origin-pr: ${{ github.event.pull_request.number }}
           destination-url: https://code.forgejo.org
+          destination-repo: cascading-pr/end-to-end
           destination-repo: forgejo/end-to-end
           destination-branch: main
           destination-token: ${{ secrets.END_TO_END_CASCADING_PR_DESTINATION }}
+          close-merge: true
           update: .forgejo/cascading-pr-end-to-end