Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ref for merged #6413

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Fix ref for merged #6413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34178fd
Update
kirklandsign Oct 21, 2024
32e02d2
Update
kirklandsign Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .github/scripts/propose_ghstack_orig_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ def parse_args():
required=True,
)
parser.add_argument(
"--pr",
type=int,
help="Number of the PR in the stack to check and create corresponding PR",
"--ref",
type=str,
help="Ref fo PR in the stack to check and create corresponding PR",
required=True,
)
return parser.parse_args()
Expand Down Expand Up @@ -68,12 +68,18 @@ def extract_stack_from_body(pr_body: str) -> List[int]:
return list(reversed(prs))


def get_pr_stack_from_number(pr_number: int, repo: Repository) -> List[int]:
def get_pr_stack_from_number(ref: str, repo: Repository) -> List[int]:
if ref.isnumeric():
pr_number = int(ref)
else:
branch_name = ref.replace("refs/heads/", "")
pr_number = repo.get_branch(branch_name).commit.get_pulls()[0].number

pr_stack = extract_stack_from_body(repo.get_pull(pr_number).body)

if not pr_stack:
raise Exception(
f"Could not find PR stack in body of #{pr_number}. "
f"Could not find PR stack in body of ref. "
+ "Please make sure that the PR was created with ghstack."
)

Expand Down Expand Up @@ -128,7 +134,7 @@ def main():

with Github(auth=Auth.Token(os.environ["GITHUB_TOKEN"])) as gh:
repo = gh.get_repo(args.repo)
create_prs_for_orig_branch(get_pr_stack_from_number(args.pr, repo), repo)
create_prs_for_orig_branch(get_pr_stack_from_number(args.ref, repo), repo)


if __name__ == "__main__":
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ghstack_land.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ jobs:
run: |
pip install pygithub
PR_NUMBER=$(echo "$GITHUB_REF" | grep -oE '[0-9]+')
python .github/scripts/propose_ghstack_orig_pr.py --pr $PR_NUMBER --repo pytorch/executorch
python .github/scripts/propose_ghstack_orig_pr.py --ref $GITHUB_REF --repo pytorch/executorch
env:
GITHUB_TOKEN: ${{ secrets.GH_PYTORCHBOT_CHERRY_PICK_TOKEN }}
GITHUB_REF: ${{ github.ref }}
Loading