From 04a2ff4fc30f2bcf90925aaac557e823aee6ef60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= <csardi.gabor@gmail.com>
Date: Wed, 30 Mar 2022 15:26:12 +0200
Subject: [PATCH] Build the next version of R as well

---
 builder/build.sh         | 4 ++++
 handler.py               | 1 +
 serverless-resources.yml | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/builder/build.sh b/builder/build.sh
index dcdaf59..0c09ffe 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -46,11 +46,15 @@ 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
+  dirname=`tar tzvf /tmp/R-next.tar.gz | head -1 | awk '{ print $NF }' | cut -d/ -f1`
+  mv /tmp/${dirname} /tmp/R-${1}
   rm /tmp/R-${1}.tar.gz
 }
 
diff --git a/handler.py b/handler.py
index debba6a..3d22e3c 100644
--- a/handler.py
+++ b/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}
 
diff --git a/serverless-resources.yml b/serverless-resources.yml
index 5685ebb..446913e 100644
--- a/serverless-resources.yml
+++ b/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: