Skip to content

Commit

Permalink
apacheGH-37639: [CI] Fix checkout on older OSes (apache#37640)
Browse files Browse the repository at this point in the history
### Rationale for this change

Jobs are failing due to not being supported by node 20

### What changes are included in this PR?

Using v3 where needed.

### Are these changes tested?

Crossbow
* Closes: apache#37639

Lead-authored-by: Jacob Wujciak-Jens <jacob@wujciak.de>
Co-authored-by: Raúl Cumplido <raulcumplido@gmail.com>
Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
  • Loading branch information
2 people authored and loicalleyne committed Nov 13, 2023
1 parent b5724a3 commit 0120b10
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions dev/tasks/macros.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ on:
- "*-github-*"
{% endmacro %}

{%- macro github_checkout_arrow(fetch_depth=1, submodules="recursive") -%}
{%- macro github_checkout_arrow(fetch_depth=1, submodules="recursive", action_v="4") -%}
- name: Checkout Arrow
uses: actions/checkout@v4
uses: actions/checkout@v{{ action_v }}
with:
fetch-depth: {{ fetch_depth }}
path: arrow
Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/r/github.macos.autobrew.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- "{{ macros.r_release.ver }}"
- "{{ macros.r_oldrel.ver }}"
steps:
{{ macros.github_checkout_arrow()|indent }}
{{ macros.github_checkout_arrow(action_v='3')|indent }}
- name: Configure autobrew script
run: |
# minio and sccache are pre-installed on the self-hosted 10.13 runner
Expand Down
3 changes: 2 additions & 1 deletion dev/tasks/r/github.packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@ jobs:
# Get the arrow checkout just for the docker config scripts
# Don't need submodules for this (hence false arg to macro): they fail on
# actions/checkout for some reason in this context
{{ macros.github_checkout_arrow(1, false)|indent }}
{{ macros.github_checkout_arrow(1, false, '3')|indent }}

- name: Install system requirements
env:
ARROW_R_DEV: "TRUE" # To install curl/openssl in r_docker_configure.sh
Expand Down

0 comments on commit 0120b10

Please sign in to comment.