From cf57fd2dc4832266baa5d358f11215d6bbfb08f7 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 19 Feb 2024 12:36:39 +0100 Subject: [PATCH 1/9] do not call actions/checkout it is the responsibility of the caller and doing it in the action may interfere --- action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/action.yml b/action.yml index b13fbd0..755770d 100644 --- a/action.yml +++ b/action.yml @@ -116,7 +116,6 @@ inputs: runs: using: "composite" steps: - - uses: actions/checkout@v4 - run: | export PATH=${{ github.action_path }}:$PATH From 632b77ff09cc809f48c2bad00c732a04d35651e2 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 19 Feb 2024 13:59:22 +0100 Subject: [PATCH 2/9] also run the tests on v* branches --- .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 bf5ba29b13787131095d79059e3d35ae81854628 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 19 Feb 2024 13:59:22 +0100 Subject: [PATCH 3/9] 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 bd58cd8c9bef5365c3bd2c856bb8ecc89aa30f45 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 20 Mar 2024 16:23:28 +0100 Subject: [PATCH 4/9] 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 ac3a1ea169cfa986dfda29462b962071d2b5ee6e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 20 Nov 2024 14:01:34 +0000 Subject: [PATCH 5/9] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..e95bd65 --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "local>actions/renovate-config" + ] +} From e504bda0dc3320b37e54a15728496fa8c4b29f48 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 7 Dec 2024 14:03:42 +0000 Subject: [PATCH 6/9] Update dependency forgejo-lxc to v12 --- .forgejo/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index f375453..b5a82cf 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -9,7 +9,7 @@ on: jobs: integration: - runs-on: self-hosted + runs-on: lxc-bookworm steps: - uses: actions/checkout@v4 From 1555709278d59012536ade5c80e80909c19a99b7 Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Sat, 7 Dec 2024 15:16:48 +0100 Subject: [PATCH 7/9] 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() { From f072f7866dac773c59c072268f3ab079c7e0244a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Dec 2024 14:31:37 +0000 Subject: [PATCH 8/9] Replace actions/setup-forgejo action with actions/setup-forgejo v1.0.0 --- .forgejo/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index b5a82cf..956bd5f 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - id: forgejo - uses: https://code.forgejo.org/actions/setup-forgejo@v1 + uses: https://code.forgejo.org/actions/setup-forgejo@v1.0.0 with: user: root password: admin1234 From d6dc30aab8b5e0dd981e7d8e00eb3cbc6c773388 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 Dec 2024 00:01:30 +0000 Subject: [PATCH 9/9] Update actions/setup-forgejo action to v1.0.1 --- .forgejo/workflows/integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/integration.yml b/.forgejo/workflows/integration.yml index 956bd5f..a91ef4e 100644 --- a/.forgejo/workflows/integration.yml +++ b/.forgejo/workflows/integration.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - id: forgejo - uses: https://code.forgejo.org/actions/setup-forgejo@v1.0.0 + uses: https://code.forgejo.org/actions/setup-forgejo@v1.0.1 with: user: root password: admin1234