Merge pull request #161 from rstudio/glin-rm-patch

Remove R-devel patch for openSUSE; add R-devel to CI tests

.github/workflows/test.yml

@@ -25,9 +25,9 @@ on:
         description: |
           Comma-separated list of R versions. Specify "last-N" to use the
           last N minor R versions, or "all" to use all minor R versions since R 3.1.
-          Defaults to "last-5".
+          Defaults to "last-5,devel".
         required: false
-        default: 'last-5'
+        default: 'last-5,devel'
         type: string
 
 permissions:

builder/Dockerfile.opensuse-153

@@ -92,5 +92,4 @@ ENV CONFIGURE_OPTIONS="\
 
 COPY package.opensuse-153 /package.sh
 COPY build.sh .
-COPY patches /patches
 ENTRYPOINT ./build.sh

builder/Dockerfile.opensuse-154

@@ -102,5 +102,4 @@ ENV JAVA_HOME=/usr/lib64/jvm/jre-11-openjdk
 
 COPY package.opensuse-154 /package.sh
 COPY build.sh .
-COPY patches /patches
 ENTRYPOINT ./build.sh

builder/build.sh

@@ -64,6 +64,7 @@ fetch_r_source() {
   rm /tmp/R-${1}.tar.gz
 }
 
+# Apply a patch for this R version if present. Typically for R-devel.
 patch_r() {
   cd /tmp/R-${1}
 

builder/patches/R-devel.patch

@@ -1,28 +0,0 @@
-diff --git a/src/extra/blas/Makefile.in b/src/extra/blas/Makefile.in
-index 3661416..c9b53e2 100644
---- a/src/extra/blas/Makefile.in
-+++ b/src/extra/blas/Makefile.in
-@@ -17,7 +17,7 @@ include $(top_builddir)/Makeconf
- 
- ALL_CFLAGS = $(ALL_CFLAGS_LO)
- ALL_FFLAGS = $(ALL_FFLAGS_LO)
--ALL_FCLAGS = $(ALL_FFLAGS_LO)
-+ALL_FCFLAGS = $(ALL_FFLAGS_LO)
- 
- SOURCES = blas00.c blas.f cmplxblas.f blas2.f90 cmplxblas2.f90
- 
-diff --git a/src/modules/lapack/Makefile.in b/src/modules/lapack/Makefile.in
-index 8e593ea..e35c956 100644
---- a/src/modules/lapack/Makefile.in
-+++ b/src/modules/lapack/Makefile.in
-@@ -15,6 +15,10 @@ include $(top_builddir)/Makeconf
- .f90.o:
- 	$(FC) $(ALL_FCFLAGS) -c @FCFLAGS_f90@ $< -o $@
- 
-+ALL_CFLAGS = $(ALL_CFLAGS_LO)
-+ALL_FFLAGS = $(ALL_FFLAGS_LO)
-+ALL_FCFLAGS = $(ALL_FFLAGS_LO)
-+
- SOURCES_C = Lapack.c @USE_VECLIB_G95FIX_TRUE@ vecLibg95c.c
- SOURCES_F = @USE_VECLIB_G95FIX_TRUE@ vecLibg95f.f
- 

builder/patches/README.md

@@ -0,0 +1,9 @@
+# Patches
+
+Patches can be applied for specific R versions and platforms. To add a patch, create a patch file
+at `patches/R-${R_VERSION}.patch` (such as `patches/R-devel.patch`), and add the following line
+to the platform Dockerfile:
+
+```dockerfile
+COPY patches /patches
+```

test/get_r_versions.py

@@ -15,10 +15,10 @@ def main():
         'versions',
         type=str,
         nargs='?',
-        default='last-5',
+        default='last-5,devel',
         help="""Comma-separated list of R versions. Specify "last-N" to use the
             last N minor R versions, or "all" to use all minor R versions since R 3.1.
-            Defaults to "last-5".
+            Defaults to "last-5,devel".
             """
     )
     args = parser.parse_args()
@@ -28,14 +28,17 @@ def main():
 
 def _get_versions(which='all'):
     supported_versions = sorted(_get_supported_versions(), reverse=True)
-    
+    versions = []
+    for version in which.split(','):
+        versions.extend(_expand_version(version, supported_versions))
+    return versions
+
+def _expand_version(which, supported_versions):
     last_n_versions = None
     if which.startswith('last-'):
         last_n_versions = int(which.replace('last-', ''))
     elif which != 'all':
-        versions = which.split(',')
-        versions = [v for v in versions if v in supported_versions]
-        return versions
+        return [which] if which in supported_versions else []
 
     versions = {}
     for ver in supported_versions: