mirror of
https://code.forgejo.org/actions/cascading-pr.git
synced 2025-06-29 21:33:43 +00:00
close-merge input
Fixes: https://code.forgejo.org/actions/cascading-pr/issues/7
This commit is contained in:
parent
f8a65b3d9f
commit
5caaedbc52
7 changed files with 80 additions and 9 deletions
23
tests/run.sh
23
tests/run.sh
|
@ -64,13 +64,15 @@ function close_pull_request() {
|
|||
}
|
||||
|
||||
function merge_pull_request() {
|
||||
forgejo-curl.sh api_json ${options[url]}/api/v1/repos/user1/originrepo/pulls | jq --raw-output '.[] | .number' | while read pr ; do
|
||||
forgejo-curl.sh api_json --data '{"Do":"merge"}' ${options[url]}/api/v1/repos/user1/originrepo/pulls/$pr/merge
|
||||
local repo=$1
|
||||
|
||||
forgejo-curl.sh api_json ${options[url]}/api/v1/repos/user1/${repo}/pulls | jq --raw-output '.[] | .number' | while read pr ; do
|
||||
forgejo-curl.sh api_json --data '{"Do":"merge"}' ${options[url]}/api/v1/repos/user1/${repo}/pulls/$pr/merge
|
||||
done
|
||||
}
|
||||
|
||||
function has_cascade_pull_request() {
|
||||
pr_count=$(forgejo-curl.sh api_json ${options[url]}/api/v1/repos/user2/destinationrepo/pulls | jq '. | length')
|
||||
pr_count=$(forgejo-curl.sh api_json ${options[url]}/api/v1/repos/user2/destinationrepo/pulls | jq '[ .[] | select(.state == "open") ] | length')
|
||||
test $pr_count -gt 0
|
||||
}
|
||||
|
||||
|
@ -227,8 +229,20 @@ function create_and_merge() {
|
|||
create_pull_request user1 user1 originrepo
|
||||
wait_success ${options[url]}/api/v1/repos/user1/originrepo $(cat $TMPDIR/user1-originrepo.sha)
|
||||
has_cascade_pull_request
|
||||
merge_pull_request
|
||||
merge_pull_request originrepo
|
||||
wait_success ${options[url]}/api/v1/repos/user1/originrepo $(cat $TMPDIR/user1-originrepo.sha)
|
||||
has_cascade_pull_request
|
||||
}
|
||||
|
||||
function create_and_merge_close() {
|
||||
fixture originrepo-close-merge destinationrepo
|
||||
|
||||
create_pull_request user1 user1 originrepo-close-merge
|
||||
wait_success ${options[url]}/api/v1/repos/user1/originrepo-close-merge $(cat $TMPDIR/user1-originrepo-close-merge.sha)
|
||||
has_cascade_pull_request
|
||||
merge_pull_request originrepo-close-merge
|
||||
wait_success ${options[url]}/api/v1/repos/user1/originrepo-close-merge $(cat $TMPDIR/user1-originrepo-close-merge.sha)
|
||||
! has_cascade_pull_request
|
||||
}
|
||||
|
||||
function integration() {
|
||||
|
@ -236,6 +250,7 @@ function integration() {
|
|||
create_from_fork_and_close
|
||||
create_and_close
|
||||
create_and_merge
|
||||
create_and_merge_close
|
||||
}
|
||||
|
||||
function unit() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue