Skip to content

GH-50336: [Release][Archery] Fix archery GitHub integration for release scripts #50337

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

Merged
kou merged 2 commits into from
Jul 2, 2026
Merged

GH-50336: [Release][Archery] Fix archery GitHub integration for release scripts #50337

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
51b9c05
GH-50336: [Release][Archery] Fix archery GitHub integration for relea…
raulcd Jul 2, 2026
5cb9378
Fix variable name
raulcd Jul 2, 2026
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
14 changes: 10 additions & 4 deletions dev/archery/archery/crossbow/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def verify_release_candidate(obj, base_branch, create_pr,
for flag, group in zip(verify_flags, verify_groups):
if flag:
job_groups += f" --group {group}"
response.create_comment(
response.create_issue_comment(
f"{command} {job_groups} --param " +
f"release={version} --param rc={rc}")

Expand Down Expand Up @@ -300,6 +300,10 @@ def asset_callback(task_name, task, asset):


@crossbow.command()
@click.option('--base-branch', default='main',
help='Set base branch for the PR.')
@click.option('--head-branch', default=None,
help='Set head branch for the PR.')
@click.option('--arrow-remote', '-r', default=None,
help='Set GitHub remote explicitly, which is going to be cloned '
'on the CI services. Note, that no validation happens '
Expand All @@ -313,7 +317,8 @@ def asset_callback(task_name, task, asset):
@click.option('--pr-title', required=True,
help='Track the job submitted on PR with given title')
@click.pass_obj
def report_pr(obj, arrow_remote, crossbow, fetch, job_name, pr_title):
def report_pr(obj, base_branch, head_branch, arrow_remote, crossbow,
fetch, job_name, pr_title):
arrow = obj['arrow']
queue = obj['queue']
if fetch:
Expand All @@ -322,11 +327,12 @@ def report_pr(obj, arrow_remote, crossbow, fetch, job_name, pr_title):

report = CommentReport(job, crossbow_repo=crossbow)
target_arrow = Repo(path=arrow.path, remote_url=arrow_remote)
pull_request = target_arrow.github_pr(title=pr_title,
pull_request = target_arrow.github_pr(base=base_branch, head=head_branch,
title=pr_title,
github_token=queue.github_token,
create=False)
# render the response comment's content on the PR
pull_request.create_comment(report.show())
pull_request.create_issue_comment(report.show())
click.echo(f'Job is tracked on PR {pull_request.html_url}')


Expand Down
3 changes: 3 additions & 0 deletions dev/release/03-binary-submit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ version_with_rc="${version}-rc${rc}"
crossbow_job_prefix="release-${version_with_rc}"
release_tag="apache-arrow-${version}-rc${rc}"
rc_branch="release-${version_with_rc}"
maint_branch="maint-${version}"

: ${ARROW_REPOSITORY:="apache/arrow"}
: ${ARROW_BRANCH:=${release_tag}}
Expand All @@ -57,5 +58,7 @@ job_name=$(archery crossbow latest-prefix --no-fetch ${crossbow_job_prefix})
archery crossbow report-pr \
--no-fetch \
--arrow-remote "https://github.com/${ARROW_REPOSITORY}" \
--base-branch ${maint_branch} \
--head-branch ${rc_branch} \
--job-name ${job_name} \
--pr-title "WIP: [Release] Verify ${rc_branch}"
Loading