diff --git a/cascading-pr.sh b/cascading-pr.sh index 2d8a8e6..d3c3572 100755 --- a/cascading-pr.sh +++ b/cascading-pr.sh @@ -248,16 +248,17 @@ function finalize_options() { function run() { local state=$(pr_state origin) + repo_login origin + repo_login destination + case "$state" in open) log_info "PR is open, update or create the cascade branch and PR" - repo_login destination upsert_destination_branch update local sha=$(sha_pushed destination) if test "$sha" ; then upsert_destination_pr - repo_login origin comment_origin_pr wait_destination_ci "$sha" fi @@ -266,18 +267,15 @@ function run() { if "$(pr_merged origin)"; then if "${options[close_merge]}" ; then log_info "PR is merged, close the cascade PR and remove the branch" - repo_login destination close_pr else log_info "PR was merged, update the cascade PR" - repo_login destination pr_get origin pr_get destination update fi else log_info "PR is closed, close the cascade PR and remove the branch" - repo_login destination close_pr fi ;;