From a26a113b00dba2d30fc03eb95f11aab7b128fcfb Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 19 Feb 2024 13:59:22 +0100 Subject: [PATCH 1/3] also run the tests on v* branches (cherry picked from commit 632b77ff09cc809f48c2bad00c732a04d35651e2) --- .forgejo/workflows/integration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index 7ebd200..f375453 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -4,6 +4,7 @@ on: push: branches: - 'main' + - 'v*' pull_request: jobs: From e6f017654e06ecda46bf82eefeaffcf5b0b0f036 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 20 Mar 2024 16:23:28 +0100 Subject: [PATCH 2/3] there may be more than one cascading PR from the same origin and they are different because the destination head is different --- cascading-pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cascading-pr.sh b/cascading-pr.sh index f2ec3db..410d96b 100755 --- a/cascading-pr.sh +++ b/cascading-pr.sh @@ -77,7 +77,7 @@ EOF } function pr_destination_title() { - echo "cascading-pr from ${options[origin_url]}/${options[origin_repo]} ${options[origin_head]}" + echo "cascading-pr from ${options[origin_url]}/${options[origin_repo]} ${options[origin_head]} to ${options[destination_head]}" } function pr_destination_body() { From af62a3a5896cdeafb90d91e1554eca36bec16273 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Sat, 7 Dec 2024 15:16:48 +0100 Subject: [PATCH 3/3] fix: print origin pr url to dest pr body --- cascading-pr.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cascading-pr.sh b/cascading-pr.sh index 410d96b..fba348e 100755 --- a/cascading-pr.sh +++ b/cascading-pr.sh @@ -81,7 +81,11 @@ function pr_destination_title() { } function pr_destination_body() { - echo "cascading-pr from ${options[origin_url]}/${options[origin_repo]} ${options[origin_head]}" + if [[ -n "${options[origin_pr]}" ]]; then + echo "cascading-pr from ${options[origin_url]}/${options[origin_repo]}/pulls/${options[origin_pr]}" + else + echo "cascading-pr from ${options[origin_url]}/${options[origin_repo]} ${options[origin_head]}" + fi } function upsert_destination_pr() {