Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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
21 changes: 10 additions & 11 deletions .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,20 @@ jobs:
continue-on-error: true
run: archery docker push ubuntu-r

rstudio:
name: "rstudio/r-base:${{ matrix.r_version }}-${{ matrix.r_image }}"
bundled:
name: "${{ matrix.config.org }}/${{ matrix.config.image }}:${{ matrix.config.tag }}"
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
strategy:
fail-fast: false
matrix:
# See https://hub.docker.com/r/rstudio/r-base
r_version: ["4.0"]
r_image:
- centos7
config:
- {org: 'rstudio', image: 'r-base', tag: '4.0-centos7'}
- {org: 'rhub', image: 'debian-gcc-devel', tag: 'latest'}
env:
R_ORG: rstudio
R_IMAGE: r-base
R_TAG: ${{ matrix.r_version }}-${{ matrix.r_image }}
R_ORG: ${{ matrix.config.org }}
R_IMAGE: ${{ matrix.config.image }}
R_TAG: ${{ matrix.config.tag }}
steps:
- name: Checkout Arrow
uses: actions/checkout@v2
Expand All @@ -120,8 +119,8 @@ jobs:
uses: actions/cache@v1
with:
path: .docker
key: ${{ matrix.r_image }}-r-${{ hashFiles('cpp/**') }}
restore-keys: ${{ matrix.r_image }}-r-
key: ${{ matrix.config.image }}-r-${{ hashFiles('cpp/**') }}
restore-keys: ${{ matrix.config.image }}-r-
- name: Setup Python
uses: actions/setup-python@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions r/tests/testthat/test-csv.R
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ test_that("read_csv_arrow() can read timestamps", {
tf <- tempfile(); on.exit(unlink(tf))
write.csv(tbl, tf, row.names = FALSE)

df <- read_csv_arrow(tf, col_types = schema(time = timestamp()))
df <- read_csv_arrow(tf, col_types = schema(time = timestamp(timezone = "UTC")))
expect_equal(tbl, df)

df <- read_csv_arrow(tf, col_types = "t", col_names = "time", skip = 1)
expect_equal(tbl, df)
expect_equal(tbl, df, check.tzone = FALSE) # col_types = "t" makes timezone-naive timestamp
})

test_that("read_csv_arrow(timestamp_parsers=)", {
Expand Down