Merge pull request #116 from gaborcsardi/feature/r-next

builder/build.sh

@@ -46,11 +46,18 @@ fetch_r_source() {
   elif [ "${1}" = devel ]; then
     # Download the daily tarball of R devel
     wget -q https://stat.ethz.ch/R/daily/R-devel.tar.gz -O /tmp/R-devel.tar.gz
+  elif [ "${1}" = "next" ]; then
+    wget -q https://cran.r-project.org/src/base-prerelease/R-latest.tar.gz -O /tmp/R-next.tar.gz
   else
     wget -q "${CRAN}/src/base/R-`echo ${1}| awk 'BEGIN {FS="."} {print $1}'`/R-${1}.tar.gz" -O /tmp/R-${1}.tar.gz
   fi
   echo "Extracting R-${1}"
   tar xf /tmp/R-${1}.tar.gz -C /tmp
+  # 'next' may contain R-patched/, R-alpha/, etc. make it R-next/
+  if [ "${1}" = "next" ]; then
+      dirname=`tar tzvf /tmp/R-next.tar.gz | head -1 | awk '{ print $NF }' | cut -d/ -f1`
+      mv /tmp/${dirname} /tmp/R-next
+  fi
   rm /tmp/R-${1}.tar.gz
 }
 

handler.py

@@ -43,6 +43,7 @@ def _cran_all_r_versions():
     r_versions = []
     r_versions.extend(_cran_r_versions(CRAN_SRC_R3_URL))
     r_versions.extend(_cran_r_versions(CRAN_SRC_R4_URL))
+    r_versions.append('next')
     r_versions.append('devel')
     return {'r_versions': r_versions}
 

serverless-resources.yml

@@ -318,7 +318,7 @@ rBuildsDevelEventRule:
     State: ${self:custom.${self:provider.stage}.eventRuleState}
     Targets:
       - Id: rbuilds
-        Input: '{"force": true, "versions": ["devel"]}'
+        Input: '{"force": true, "versions": ["next", "devel"]}'
         RoleArn:
           Fn::GetAtt: [ rBuildsEventRuleIamRole, Arn ]
         Arn: