From 8c7531f5f5a765b80a666833e862912ea85e053e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Drago=C8=99=20Moldovan-Gr=C3=BCnfeld?= Date: Fri, 15 Jul 2022 13:17:26 +0100 Subject: [PATCH 1/5] install package before linting --- .github/workflows/r.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 4a9c605e3bc..bcf75131071 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -327,6 +327,7 @@ jobs: shell: Rscript {0} working-directory: r run: | + pak::pak(".") pak::pak("lintr") lintr::expect_lint_free() - name: Dump install logs From a2a424df06c848581ebc5c8b98deb085debb826c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Drago=C8=99=20Moldovan-Gr=C3=BCnfeld?= Date: Fri, 15 Jul 2022 15:39:52 +0100 Subject: [PATCH 2/5] try with `pak::pak("local::.")` --- .github/workflows/r.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index bcf75131071..68526d315f5 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -327,7 +327,7 @@ jobs: shell: Rscript {0} working-directory: r run: | - pak::pak(".") + pak::pak("local::.") pak::pak("lintr") lintr::expect_lint_free() - name: Dump install logs From e082813b2da4ef75cc76167eb72a5269dfaca546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Drago=C8=99=20Moldovan-Gr=C3=BCnfeld?= Date: Mon, 18 Jul 2022 14:35:22 +0100 Subject: [PATCH 3/5] add env var to point to the libarrow.zip --- .github/workflows/r.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 68526d315f5..51bd1ec3fdc 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -327,6 +327,12 @@ jobs: shell: Rscript {0} working-directory: r run: | + Sys.setenv( + RWINLIB_LOCAL = file.path(Sys.getenv("GITHUB_WORKSPACE"), "r", "windows", "libarrow.zip"), + MAKEFLAGS = paste0("-j", parallel::detectCores()), + ARROW_R_DEV = TRUE, + "_R_CHECK_FORCE_SUGGESTS_" = FALSE + ) pak::pak("local::.") pak::pak("lintr") lintr::expect_lint_free() From d21e9217ea4aa782a38bfe30e56d8f8ac2ea73c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Drago=C8=99=20Moldovan-Gr=C3=BCnfeld?= Date: Mon, 18 Jul 2022 16:10:30 +0100 Subject: [PATCH 4/5] lint --- r/tests/testthat/test-dplyr-glimpse.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/r/tests/testthat/test-dplyr-glimpse.R b/r/tests/testthat/test-dplyr-glimpse.R index 9deb9087b17..c93273bdeef 100644 --- a/r/tests/testthat/test-dplyr-glimpse.R +++ b/r/tests/testthat/test-dplyr-glimpse.R @@ -17,7 +17,7 @@ # The glimpse output for tests with `example_data` is different on R < 3.6 # because the `lgl` column is generated with `sample()` and the RNG -# algorithm is different in older R versions. +# algorithm is different in older R versions. skip_on_r_older_than("3.6") library(dplyr, warn.conflicts = FALSE) From 112e8702736bfa35ccbeb696ebc2c8e105e9ee7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Drago=C8=99=20Moldovan-Gr=C3=BCnfeld?= Date: Tue, 26 Jul 2022 21:09:10 +0100 Subject: [PATCH 5/5] switch to `pak::local_install()` + comment --- .github/workflows/r.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml index 51bd1ec3fdc..4f706e3e5b1 100644 --- a/.github/workflows/r.yml +++ b/.github/workflows/r.yml @@ -333,7 +333,8 @@ jobs: ARROW_R_DEV = TRUE, "_R_CHECK_FORCE_SUGGESTS_" = FALSE ) - pak::pak("local::.") + # we use pak for package installation since it is faster, safer and more convenient + pak::local_install() pak::pak("lintr") lintr::expect_lint_free() - name: Dump install logs