apacheGH-39996: [Archery] Fix Crossbow build on a PR from a fork's ma…

…in branch Continued from PR apache#39997, which wasn't sufficient (the `git fetch` that works for me doesn't seem to work on GHA).
pitrou · Feb 8, 2024 · 17455a9 · 17455a9
1 parent 30f6fdb
commit 17455a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/comment_bot.yml b/.github/workflows/comment_bot.yml
@@ -51,7 +51,7 @@ jobs:
           ARROW_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROSSBOW_GITHUB_TOKEN: ${{ secrets.CROSSBOW_GITHUB_TOKEN }}
         run: |
-          archery trigger-bot \
+          archery --debug trigger-bot \
             --event-name ${{ github.event_name }} \
             --event-payload ${{ github.event_path }}
 

diff --git a/dev/archery/archery/bot.py b/dev/archery/archery/bot.py
@@ -349,7 +349,7 @@ def _clone_arrow_and_crossbow(dest, crossbow_repo, arrow_repo_url,
     # submitted from a fork's main branch (GH-39996)
     git.clone('--bare', arrow_repo_url, str(bare_arrow_path))
     # fetch the PR's branch into the bare clone
-    git.fetch('origin', pr_ref, git_dir=bare_arrow_path)
+    git.fetch('--fetch', 'origin', pr_ref, git_dir=bare_arrow_path)
     # clone and checkout the PR's branch into a full local repo
     git.clone(f'--branch={pr_branch}', bare_arrow_path, arrow_path)