From cfaa6e0eacd38762e8665469f715414fe22954ff Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sun, 26 Jul 2020 16:19:24 -0700 Subject: [PATCH 1/3] fix --- .github/workflows/master.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index fe01b92036377..042bb9af0ca6a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -163,7 +163,9 @@ jobs: if: contains(matrix.modules, 'sparkr') run: | sudo apt-get install -y libcurl4-openssl-dev - sudo Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'devtools', 'e1071', 'survival', 'arrow', 'roxygen2'), repos='https://cloud.r-project.org/')" + sudo Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'devtools', 'e1071', 'survival', 'roxygen2'), repos='https://cloud.r-project.org/')" + # SPARK-XXX: arrow 1.0.0 breaks arrow unit tests + sudo Rscript -e "install.packages('https://cran.r-project.org/src/contrib/Archive/arrow/arrow_0.17.1.tar.gz', repos=NULL, type='source')" # Show installed packages in R. sudo Rscript -e 'pkg_list <- as.data.frame(installed.packages()[, c(1,3:4)]); pkg_list[is.na(pkg_list$Priority), 1:2, drop = FALSE]' # Run the tests. From 6a00a756b74c645ceeea00bb9c532cf78a3cfe4d Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sun, 26 Jul 2020 16:53:24 -0700 Subject: [PATCH 2/3] Update AppVeyor together --- .github/workflows/master.yml | 2 +- appveyor.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 042bb9af0ca6a..292a79af39c46 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -164,7 +164,7 @@ jobs: run: | sudo apt-get install -y libcurl4-openssl-dev sudo Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'devtools', 'e1071', 'survival', 'roxygen2'), repos='https://cloud.r-project.org/')" - # SPARK-XXX: arrow 1.0.0 breaks arrow unit tests + # SPARK-32451: arrow 1.0.0 breaks unit tests sudo Rscript -e "install.packages('https://cran.r-project.org/src/contrib/Archive/arrow/arrow_0.17.1.tar.gz', repos=NULL, type='source')" # Show installed packages in R. sudo Rscript -e 'pkg_list <- as.data.frame(installed.packages()[, c(1,3:4)]); pkg_list[is.na(pkg_list$Priority), 1:2, drop = FALSE]' diff --git a/appveyor.yml b/appveyor.yml index 1fd91daae9015..596575936c60e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,7 +42,9 @@ install: # Install maven and dependencies - ps: .\dev\appveyor-install-dependencies.ps1 # Required package for R unit tests - - cmd: Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'e1071', 'survival', 'arrow'), repos='https://cloud.r-project.org/')" + - cmd: Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'e1071', 'survival'), repos='https://cloud.r-project.org/')" + # SPARK-32451: arrow 1.0.0 breaks unit tests + - cmd: Rscript -e "install.packages('https://cran.r-project.org/src/contrib/Archive/arrow/arrow_0.17.1.tar.gz', repos=NULL, type='source')" - cmd: Rscript -e "pkg_list <- as.data.frame(installed.packages()[,c(1, 3:4)]); pkg_list[is.na(pkg_list$Priority), 1:2, drop = FALSE]" build_script: From 395ef0bae5a8138b42fe441018f87e1ca3957f93 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sun, 26 Jul 2020 17:45:00 -0700 Subject: [PATCH 3/3] fix --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 596575936c60e..70780d034cccf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,6 +59,8 @@ environment: # "(converted from warning) unable to identify current timezone 'C':" for an unknown reason. # This environment variable works around to test SparkR against a higher version. R_REMOTES_NO_ERRORS_FROM_WARNINGS: true + # AppVeyor doesn't have python3 yet + PYSPARK_PYTHON: python test_script: - cmd: .\bin\spark-submit2.cmd --driver-java-options "-Dlog4j.configuration=file:///%CD:\=/%/R/log4j.properties" --conf spark.hadoop.fs.defaultFS="file:///" R\pkg\tests\run-all.R