Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
15 changes: 7 additions & 8 deletions .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ jobs:
fail-fast: false
matrix:
config:
- { rtools: 40, arch: 'ucrt64' }
- { rtools: 42, arch: 'ucrt64' }
steps:
- run: git config --global core.autocrlf false
- name: Checkout Arrow
Expand All @@ -228,10 +228,10 @@ jobs:
r-${{ matrix.config.rtools }}-ccache-mingw-${{ matrix.config.arch }}-
- uses: r-lib/actions/setup-r@v2
with:
# Note: RTools must be 40 here because RTools40 + ucrt is how we build the Arrow C++
# static library. The R is not used here but R 4.1 was the last R to use
# Rtools40.
r-version: "4.1"
# Note: RTools must be 42 here because RTools42 + ucrt is how we build the Arrow C++
# static library. The R is not used here but R 4.2 was the last R to use
# Rtools42.
r-version: "4.2"
rtools-version: ${{ matrix.config.rtools }}
Ncpus: 2
- name: Build Arrow C++
Expand Down Expand Up @@ -284,14 +284,13 @@ jobs:
- name: Download Timezone Database
shell: bash
run: |
# RTools 40 uses GCC 8.x which does not support C++20 chrono timezones,
# so Arrow uses the vendored date library which requires tzdata
# Download tzdata in case the vendored date library is used for timezones
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the RTools bump and associated GCC version increase means that this is no longer needed?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@amoeba would know more than I do, but I think we still need to workaround the tz file issue, but we now do that with an R package instead of the C++ program thing here. Or am I confused about that?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the comment to be clearer now.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove this, but a separate PR is fine. We still need to use this script in other CI jobs where R isn't involved.

ci/scripts/download_tz_database.sh
- run: mkdir r/windows
- name: Download artifacts
uses: actions/download-artifact@v8
with:
name: libarrow-rtools40-ucrt64.zip
name: libarrow-rtools42-ucrt64.zip
path: r/windows
- name: Unzip and rezip libarrows
shell: bash
Expand Down
2 changes: 0 additions & 2 deletions dev/tasks/macros.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,6 @@ env:
{# use filter to cast to string and convert to lowercase to match yaml boolean #}
{% set is_fork = (not is_upstream_b)|lower %}

{% set r_release = {"ver": "4.2", "rt" : "42"} %}
{% set r_oldrel = {"ver": "4.1", "rt" : "40"} %}
Comment on lines -280 to -281
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These variables are never used anywhere


{%- macro github_set_env(env) -%}
{% if env is defined %}
Expand Down
8 changes: 4 additions & 4 deletions dev/tasks/r/github.linux.arrow.version.back.compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ jobs:
- { old_arrow_version: '10.0.1', r: '4.2' }
- { old_arrow_version: '9.0.0', r: '4.2' }
- { old_arrow_version: '8.0.0', r: '4.2' }
- { old_arrow_version: '7.0.0', r: '4.1' }
- { old_arrow_version: '6.0.1', r: '4.1' }
- { old_arrow_version: '5.0.0', r: '4.1' }
- { old_arrow_version: '4.0.0', r: '4.1' }
- { old_arrow_version: '7.0.0', r: '4.2' }
- { old_arrow_version: '6.0.1', r: '4.2' }
- { old_arrow_version: '5.0.0', r: '4.2' }
- { old_arrow_version: '4.0.0', r: '4.2' }
env:
ARROW_R_DEV: "TRUE"
OLD_ARROW_VERSION: {{ '${{ matrix.config.old_arrow_version }}' }}
Expand Down
1 change: 0 additions & 1 deletion dev/tasks/r/github.linux.versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
r_version:
# We test devel, release, and oldrel in regular CI.
# This is for older versions
- "4.1"
- "4.2"
- "4.3"
- "4.4"
Expand Down
2 changes: 1 addition & 1 deletion r/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Description: 'Apache' 'Arrow' <https://arrow.apache.org/> is a cross-language
language-independent columnar memory format for flat and hierarchical data,
organized for efficient analytic operations on modern hardware. This
package provides an interface to the 'Arrow C++' library.
Depends: R (>= 4.1)
Depends: R (>= 4.2)
License: Apache License (>= 2.0)
URL: https://github.com/apache/arrow/, https://arrow.apache.org/docs/r/
BugReports: https://github.com/apache/arrow/issues
Expand Down
Loading