Skip to content

Commit a200063

Browse files
committed
Remove older arrow, change how we source our helpers
1 parent 678a166 commit a200063

2 files changed

Lines changed: 4 additions & 24 deletions

File tree

‎dev/tasks/r/github.linux.arrow.version.back.compat.yml‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,7 @@ jobs:
6666
read-files:
6767
name: "Read files with Arrow {{ '${{ matrix.config.old_arrow_version }}' }}"
6868
needs: [write-files]
69-
# condition && true-case || false-case
70-
# ==
71-
# condition ? true-case : false-case
72-
#
73-
# We use Ubuntu 20.04 for 3.0.0 or earlier because 3.0.0 or
74-
# earlier can't be built on Ubuntu 22.04. We will drop 3.0.0 or
75-
# earlier when Ubuntu 20.04 is unavailable on GitHub Actions.
76-
runs-on: >-
77-
{{ "${{ (startsWith(matrix.config.old_arrow_version, '3.') ||
78-
startsWith(matrix.config.old_arrow_version, '2.') ||
79-
startsWith(matrix.config.old_arrow_version, '1.')) &&
80-
'ubuntu-20.04' ||
81-
'ubuntu-22.04' }}" }}
69+
runs-on: 'ubuntu-22.04'
8270
strategy:
8371
fail-fast: false
8472
matrix:
@@ -100,10 +88,7 @@ jobs:
10088
- { old_arrow_version: '7.0.0', r: '4.1' }
10189
- { old_arrow_version: '6.0.1', r: '4.1' }
10290
- { old_arrow_version: '5.0.0', r: '4.1' }
103-
- { old_arrow_version: '4.0.0', r: '4.0' }
104-
- { old_arrow_version: '3.0.0', r: '4.0' }
105-
- { old_arrow_version: '2.0.0', r: '4.0' }
106-
- { old_arrow_version: '1.0.1', r: '4.0' }
91+
- { old_arrow_version: '4.0.0', r: '4.1' }
10792
env:
10893
ARROW_R_DEV: "TRUE"
10994
OLD_ARROW_VERSION: {{ '${{ matrix.config.old_arrow_version }}' }}
@@ -118,11 +103,6 @@ jobs:
118103
# for 6.0.0 or later.
119104
rspm="https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"
120105
echo "RSPM=${rspm}" >> $GITHUB_ENV
121-
elif [ ${old_arrow_version_major} -le 3 ]; then
122-
# We use Ubuntu 20.04 for 3.0.0 or earlier because 3.0.0 or earlier
123-
# can't be built on Ubuntu 22.04.
124-
rspm="https://packagemanager.rstudio.com/cran/__linux__/focal/latest"
125-
echo "RSPM=${rspm}" >> $GITHUB_ENV
126106
fi
127107
- uses: r-lib/actions/setup-r@v2
128108
with:
@@ -135,6 +115,8 @@ jobs:
135115
- name: Setup our testing directory, copy only the tests to it.
136116
run: |
137117
mkdir -p extra-tests/files
118+
# Move test helpers for e.g. skip_if_arrow_version_less_than()
119+
cp arrow/r/tests/testthat/helper*.R extra-tests/
138120
cp arrow/r/extra-tests/*.R extra-tests/
139121
- name: Download artifacts
140122
uses: actions/download-artifact@v4

‎r/extra-tests/test-read-files.R‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
library(arrow)
1919
library(testthat)
2020

21-
source("tests/testthat/helper-skip.R")
22-
2321
pq_file <- "files/ex_data.parquet"
2422

2523
test_that("Can read the file (parquet)", {

0 commit comments

Comments
 (0)