From 9ab760c7f6fd44e02ddf25800a58bfcb47876db5 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Sun, 20 Oct 2024 22:44:58 -0700 Subject: [PATCH 1/2] Update [ghstack-poisoned] --- .github/scripts/propose_ghstack_orig_pr.py | 1 - .github/workflows/ghstack_land.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/scripts/propose_ghstack_orig_pr.py b/.github/scripts/propose_ghstack_orig_pr.py index a5c715e9455..cf156fa5df9 100644 --- a/.github/scripts/propose_ghstack_orig_pr.py +++ b/.github/scripts/propose_ghstack_orig_pr.py @@ -88,7 +88,6 @@ def create_prs_for_orig_branch(pr_stack: List[int], repo: Repository): pr = repo.get_pull(pr_stack[i]) if not pr.is_merged(): print("The PR (and stack above) is not merged yet, skipping") - return # 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..72dabe75bad 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: [open, synchronize, closed] branches: - 'gh/cccclai/[0-9]+/base' - 'gh/dbort/[0-9]+/base' From 62859eedf205f56ecbf37b9d1641202d988158aa Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Sun, 20 Oct 2024 22:47:07 -0700 Subject: [PATCH 2/2] Update [ghstack-poisoned] --- .github/scripts/propose_ghstack_orig_pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/propose_ghstack_orig_pr.py b/.github/scripts/propose_ghstack_orig_pr.py index cf156fa5df9..06e1bd5a3c1 100644 --- a/.github/scripts/propose_ghstack_orig_pr.py +++ b/.github/scripts/propose_ghstack_orig_pr.py @@ -87,7 +87,7 @@ 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") + 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