Commit graph

119 commits

Author SHA1 Message Date
earl-warren
27e6cc5755
Merge pull request 'fix: loop over the open pull requests to get an exact title match' (#37) from earl-warren/cascading-pr:wip-search into main
Some checks are pending
integration / integration (push) Waiting to run
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/37
2025-07-20 13:30:44 +00:00
Earl Warren
3726ed27c9
fix: loop over the open pull requests to get an exact title match
The q= argument of the search may not return matches that are exactly
the title depending on how the issue search is defined.

https://code.forgejo.org/forgejo/end-to-end/actions/runs/3505/jobs/4

is an example of a failed run because q= did not match the right pull
request.
2025-07-20 15:11:56 +02:00
Earl Warren
80ba22a9a4
fix(ci): do not push with basic auth 2025-07-20 15:11:56 +02:00
Earl Warren
c13c83cba2
chore(upgrade): setup-forgejo@v1.0.1 to setup-forgejo@v3.0.1 2025-07-20 15:11:40 +02:00
Earl Warren
029ff0f858
chore(ci): run tests against v11 2025-07-20 15:10:48 +02:00
Earl Warren
e5c5476a44
chore(tests): fail if token cannot be obtained 2025-07-20 15:10:48 +02:00
Earl Warren
d7e60d3ba3
chore: upgrade forgejo-curl.sh 2025-07-20 15:10:45 +02:00
Earl Warren
2b01e2dc4f
chore: test instructions with Forgejo v11.0.3 2025-07-20 12:35:15 +02:00
Earl Warren
06248c771c
chore: shmft (#36)
Some checks are pending
integration / integration (push) Waiting to run
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/36
Co-authored-by: Earl Warren <contact@earl-warren.org>
Co-committed-by: Earl Warren <contact@earl-warren.org>
2025-07-20 05:38:43 +00:00
Michael Kriese
98b48e57d7 Merge pull request 'Update actions/setup-forgejo action to v1.0.1' (#32) from renovate/actions-setup-forgejo-1.x into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/32
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-10 05:50:54 +00:00
Renovate Bot
d6dc30aab8
Update actions/setup-forgejo action to v1.0.1 2024-12-10 00:01:30 +00:00
Michael Kriese
1d5c353846 Merge pull request 'Replace actions/setup-forgejo action with actions/setup-forgejo v1.0.0' (#30) from renovate/actions-setup-forgejo-replacement into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/30
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-09 15:09:45 +00:00
Renovate Bot
f072f7866d
Replace actions/setup-forgejo action with actions/setup-forgejo v1.0.0 2024-12-09 14:31:37 +00:00
Michael Kriese
f461edbd25 Merge pull request 'Update dependency forgejo-lxc to v12' (#28) from renovate/forgejo-lxc-12.x into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/28
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
2024-12-09 14:02:43 +00:00
Michael Kriese
1a1ee091b9 Merge pull request 'fix: print origin pr url to dest pr body' (#29) from fix/dest-pr-body into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/29
2024-12-09 12:12:53 +00:00
Michael Kriese
1555709278
fix: print origin pr url to dest pr body 2024-12-07 15:16:48 +01:00
Renovate Bot
e504bda0dc
Update dependency forgejo-lxc to v12 2024-12-07 14:03:42 +00:00
Michael Kriese
184ebe0397 Merge pull request 'Configure Renovate' (#26) from renovate/configure into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/26
Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>
2024-11-22 09:03:06 +00:00
Renovate Bot
ac3a1ea169
Add renovate.json 2024-11-20 14:01:34 +00:00
earl-warren
df9f617caf Merge pull request 'there may be more than one cascading PR from the same origin' (#22) from earl-warren/cascading-pr:wip-duplicate into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/22
2024-03-20 15:47:35 +00:00
Earl Warren
bd58cd8c9b
there may be more than one cascading PR from the same origin
and they are different because the destination head is different
2024-03-20 16:23:28 +01:00
Earl Warren
632b77ff09
also run the tests on v* branches 2024-02-19 13:59:22 +01:00
earl-warren
cfe5ef6817 Merge pull request 'do not call actions/checkout' (#21) from earl-warren/cascading-pr:wip-checkout into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/21
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
2024-02-19 12:56:48 +00:00
Earl Warren
cf57fd2dc4
do not call actions/checkout
it is the responsibility of the caller and doing it in the action may interfere
2024-02-19 12:36:39 +01:00
earl-warren
2ad02b3ff6 Merge pull request 'close-merge is close and applies to destination-ref as well' (#19) from earl-warren/cascading-pr:wip-ref into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/19
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
2024-01-09 19:23:54 +00:00
Earl Warren
417a1ecac9
remove branches when closing a cascade PR from a fork
Fixes: https://code.forgejo.org/actions/cascading-pr/issues/17
2024-01-09 19:48:08 +01:00
Earl Warren
09dc15f425
close-merge is close and applies to destination-ref as well
* workflows that have close-merge need to change to close
* the behavior for when origin-pr is set does not change
* the behavior for when origin-ref is set is to honor close
  instead of always closing the PR
2024-01-09 19:47:48 +01:00
Earl Warren
5007c13756
add missing test branch_and_fail to the CI 2024-01-09 19:46:07 +01:00
Earl Warren
ff13323a95
README: explain where to find the logs in local debug mode 2024-01-09 19:40:09 +01:00
earl-warren
a93a5f75b3 Merge pull request 'clarify the documentation for the prefix input' (#18) from earl-warren/cascading-pr:wip-ref into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/18
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
2024-01-09 18:32:04 +00:00
Earl Warren
0ed38df165
clarify the documentation for the prefix input 2024-01-09 14:49:09 +01:00
Earl Warren
6ad77b3c22
not all destination PR are about an origin PR 2024-01-03 19:20:39 +01:00
earl-warren
3402cff299 Merge pull request 'allow running on a ref instead of a PR' (#16) from earl-warren/cascading-pr:wip-ref into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/16
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
2024-01-03 15:27:57 +00:00
Earl Warren
0c3c8b591b
allow running on a ref instead of a PR
When running from a PR, the ref is the head of the PR in the origin
repository. The PR is used to:

* display comments about the location of the destination PR
* asynchronously close / merge the destination PR when something
  happens in the origin PR

When only the ref is available, the destination PR must be closed and
the corresponding branch destroyed immediately after it concludes
because there is no convenient way to know what or when something
else will happen.
2024-01-03 16:12:23 +01:00
earl-warren
0e9a4e846b Merge pull request 'always push what has been changed at destination' (#15) from earl-warren/cascading-pr:wip-race into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/15
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
2023-12-23 23:27:15 +00:00
Earl Warren
109016e50d
always push what has been changed at destination 2023-12-24 00:08:24 +01:00
Earl Warren
18b334170a
run on pull requests 2023-12-23 20:00:59 +01:00
earl-warren
9bf77b90a4 Merge pull request 'wait until the repository is updated when pushing' (#14) from earl-warren/cascading-pr:wip-race into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/14
Reviewed-by: dachary <dachary@noreply.code.forgejo.org>
2023-12-23 18:20:18 +00:00
Earl Warren
4a063913d4
wait until the repository is updated when pushing
as it indicates the push event was processed

Fixes: https://code.forgejo.org/actions/cascading-pr/issues/13
2023-12-23 18:32:49 +01:00
Earl Warren
9b5272e49c
no need to checkout before running cascading-pr 2023-11-08 17:42:51 +01:00
Earl Warren
e858de5450
documentation: emphasize the head of a pull request is not trusted 2023-11-08 17:20:04 +01:00
Earl Warren
9e848c27a8
add the forgejo dependency graph in the README 2023-11-05 00:02:27 +01:00
earl-warren
ff9bc575f5 Merge pull request 'reword the introduction and clarify the purpose' (#12) from earl-warren/cascading-pr:wip-readme into main
Reviewed-on: https://code.forgejo.org/actions/cascading-pr/pulls/12
2023-11-01 20:47:17 +00:00
Earl Warren
35760ba012
reword the introduction and clarify the purpose 2023-11-01 21:33:35 +01:00
Earl Warren
15dc3ec7a7
simplify the retry implementation and tests 2023-11-01 18:45:07 +01:00
Earl Warren
9d138db73c
add destination-fork-repo to the README 2023-11-01 17:47:42 +01:00
Earl Warren
5a2e9385b0
move the runner & forgejo test logs to a different step 2023-11-01 17:28:44 +01:00
Earl Warren
de6776aa88
include all tests in the integration function 2023-11-01 17:23:58 +01:00
Earl Warren
84c7b12c83
add test for implicit creation of a fork in an organization 2023-11-01 17:04:03 +01:00
Earl Warren
26490da8d2
read from the output instead of nothing 2023-11-01 16:33:20 +01:00