Skip to content

GH-39996: [Archery] Fix Crossbow build on a PR from a fork's main branch#40002

Merged
pitrou merged 1 commit intoapache:mainfrom
pitrou:gh39996-git-force
Feb 12, 2024
Merged

GH-39996: [Archery] Fix Crossbow build on a PR from a fork's main branch#40002
pitrou merged 1 commit intoapache:mainfrom
pitrou:gh39996-git-force

Conversation

@pitrou
Copy link
Copy Markdown
Member

@pitrou pitrou commented Feb 8, 2024

Instead of doing an intermediate bare clone, just fix the locally created branch name when fetching.

Amended from PR #39997, which wasn't sufficient (the git fetch that works for me doesn't seem to work on GHA).

@github-actions github-actions bot added the awaiting review Awaiting review label Feb 8, 2024
@pitrou
Copy link
Copy Markdown
Member Author

pitrou commented Feb 8, 2024

@kou This might fix the issue. Also enables more thorough logging in Archery.

@github-actions github-actions bot added awaiting changes Awaiting changes and removed awaiting review Awaiting review labels Feb 9, 2024
…in branch

Instead of doing an intermediate bare clone, just fix the locally created branch name when fetching.

Amended from PR apache#39997, which wasn't sufficient (the `git fetch` that works for me doesn't seem to work on GHA).
@github-actions github-actions bot added awaiting change review Awaiting change review and removed awaiting changes Awaiting changes labels Feb 12, 2024
@pitrou
Copy link
Copy Markdown
Member Author

pitrou commented Feb 12, 2024

The function works locally again, but I'll have to merge for end-to-end testing.

@pitrou pitrou merged commit 52e5603 into apache:main Feb 12, 2024
@pitrou pitrou removed the awaiting change review Awaiting change review label Feb 12, 2024
@pitrou
Copy link
Copy Markdown
Member Author

pitrou commented Feb 12, 2024

@github-actions crossbow submit conda-clean

@github-actions
Copy link
Copy Markdown

Revision: d6d661d

Submitted crossbow builds: ursacomputing/crossbow @ actions-7a36663285

Task Status
conda-clean Azure

@pitrou
Copy link
Copy Markdown
Member Author

pitrou commented Feb 12, 2024

Ok, it finally worked:
#39878 (comment)

@pitrou pitrou deleted the gh39996-git-force branch February 12, 2024 15:36
@conbench-apache-arrow
Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 6 benchmarking runs that have been run so far on merge-commit 52e5603.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details. It also includes information about 2 possible false positives for unstable benchmarks that are known to sometimes produce them.

dgreiss pushed a commit to dgreiss/arrow that referenced this pull request Feb 19, 2024
…in branch (apache#40002)

Instead of doing an intermediate bare clone, just fix the locally created branch name when fetching.

Amended from PR apache#39997, which wasn't sufficient (the `git fetch` that works for me doesn't seem to work on GHA).

* Closes: apache#39996

Authored-by: Antoine Pitrou <antoine@python.org>
Signed-off-by: Antoine Pitrou <antoine@python.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Archery] Crossbow refuses to run on the main branch of a fork

2 participants