diff --git a/.github/scripts/propose_ghstack_orig_pr.py b/.github/scripts/propose_ghstack_orig_pr.py index a5c715e9455..d156a7f1df9 100644 --- a/.github/scripts/propose_ghstack_orig_pr.py +++ b/.github/scripts/propose_ghstack_orig_pr.py @@ -87,8 +87,8 @@ def create_prs_for_orig_branch(pr_stack: List[int], repo: Repository): for i in range(len(pr_stack)): pr = repo.get_pull(pr_stack[i]) if not pr.is_merged(): - print("The PR (and stack above) is not merged yet, skipping") - return + # add some comment + pass # Check for invariant: For the current PR, it must be gh/user/x/base <- gh/user/x/head assert pr.base.ref.replace("base", "head") == pr.head.ref # The PR we want to create is then "branch_to_merge" <- gh/user/x/orig diff --git a/.github/workflows/ghstack_land.yml b/.github/workflows/ghstack_land.yml index 2c91a1aa404..8ba43ca3a18 100644 --- a/.github/workflows/ghstack_land.yml +++ b/.github/workflows/ghstack_land.yml @@ -1,7 +1,7 @@ name: Propose to merge ghstack orig PRs to main on: pull_request: - types: [closed] + types: [opened, synchronize, closed] branches: - 'gh/cccclai/[0-9]+/base' - 'gh/dbort/[0-9]+/base'