ci: refactor r tests, from 8 to 5 (~15 min saved)

repo2docker/buildpacks/r.py

@@ -79,7 +79,7 @@ class RBuildPack(PythonBuildPack):
         #
         # NOTE: When updating this version, also update
         #       - tests/unit/test_r.py -> test_version_specification
-        #       - tests/r/simple/verify
+        #       - tests/r/r-rspm-apt/verify
         #
         r_version = version_map["4.2"]
 

tests/r/apt/install.R

@@ -1 +0,0 @@
-install.packages("viridisLite")

tests/r/apt/runtime.txt

@@ -1 +0,0 @@
-r-4.1-2021-10-22

tests/r/mran/install.R

@@ -1 +0,0 @@
-install.packages("testthat")

tests/r/r-rspm-apt/install.R

@@ -0,0 +1 @@
+install.packages("digest")

tests/r/r-rspm-apt/runtime.txt

@@ -0,0 +1 @@
+r-2022-06-23

tests/r/r-rspm-apt/verify

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+./verify.sh
+./verify.r

tests/r/r-rspm-apt/verify.r

@@ -1,7 +1,9 @@
 #!/usr/bin/env Rscript
-library('testthat')
+library('digest')
 
-# Fail if version is not 4.2
+
+# Fail if version isn't 4.2, the default version for the RBuildPack
+print(version)
 if (!(version$major == "4" && as.double(version$minor) >= 2 && as.double(version$minor) < 3)) {
   quit("yes", 1)
-}
+}

tests/r/r-rspm-apt/verify.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
+
 apt list
 apt list | grep libsodium-dev
-# make sure we got R
-which R

tests/r/r-rspm-description/DESCRIPTION

@@ -1,6 +1,6 @@
 Package: binderdescription
 Version: 0.1
-Date: 2018-09-18
+Date: 2022-06-23
 Title: Binder R DESCRIPTION support
 Description: Test that automatically building R packages works
 Author: Bastian Greshake Tzovaras <bgreshake@googlemail.com>

tests/r/r3.6-mran/install.R

@@ -0,0 +1 @@
+install.packages("digest")

tests/r/r3.6-mran/verify

@@ -1,7 +1,11 @@
 #!/usr/bin/env Rscript
-library('testthat')
+library('digest')
 
+# Fail if version is not 3.6
 print(version)
+if (!(version$major == "3" && as.double(version$minor) >= 6 && as.double(version$minor) < 7)) {
+  quit("yes", 1)
+}
 
 # Fail if MRAN isn't the configured CRAN mirror
 if (!(startsWith(options()$repos["CRAN"], "https://mran.microsoft.com"))) {

tests/r/r3.6/install.R

@@ -1 +0,0 @@
-install.packages("testthat")

tests/r/r3.6/runtime.txt

@@ -1 +0,0 @@
-r-3.6-2018-07-07

tests/r/r3.6/verify

@@ -1,8 +0,0 @@
-#!/usr/bin/env Rscript
-library('testthat')
-
-print(version)
-# Fail if version is not 3.6
-if (!(version$major == "3" && as.double(version$minor) >= 6 && as.double(version$minor) < 7)) {
-  quit("yes", 1)
-}

tests/r/r4.0-mran/install.R

@@ -0,0 +1 @@
+install.packages("digest")

tests/r/r4.0-mran/verify

@@ -1,8 +1,8 @@
 #!/usr/bin/env Rscript
-library('testthat')
+library('digest')
 
-print(version)
 # Fail if version is not 4.0
+print(version)
 if (!(version$major == "4" && as.double(version$minor) >= 0 && as.double(version$minor) < 1)) {
   quit("yes", 1)
 }

tests/r/r4.0-rspm/install.R

@@ -1 +1 @@
-install.packages("testthat")
+install.packages("digest")

tests/r/r4.0-rspm/verify

@@ -1,8 +1,8 @@
 #!/usr/bin/env Rscript
-library('testthat')
+library('digest')
 
-print(version)
 # Fail if version is not 4.0
+print(version)
 if (!(version$major == "4" && as.double(version$minor) >= 0 && as.double(version$minor) < 1)) {
   quit("yes", 1)
 }

tests/r/r4.0/install.R

@@ -1 +0,0 @@
-install.packages("testthat")

tests/r/r4.1/install.R

@@ -1 +0,0 @@
-install.packages("testthat")

tests/r/r4.1/runtime.txt

@@ -1 +0,0 @@
-r-4.1-2021-10-22

tests/r/r4.1/verify

@@ -1,12 +0,0 @@
-#!/usr/bin/env Rscript
-library('testthat')
-
-# Fail if version is not 4.1
-if (!(version$major == "4" && as.double(version$minor) >= 1 && as.double(version$minor) < 2)) {
-  quit("yes", 1)
-}
-
-# R 4.1 always uses rspm snapshots
-if (!(startsWith(options()$repos["CRAN"], "https://packagemanager.rstudio.com"))) {
-  quit("yes", 1)
-}

tests/r/simple/install.R

@@ -1 +0,0 @@
-install.packages("testthat")

tests/r/simple/runtime.txt

@@ -1 +0,0 @@
-r-2020-07-07