From d7969ab1d44e4875848c2a19bf356d15fef68452 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 2 Apr 2021 23:34:26 -0500 Subject: [PATCH 1/2] [ci] upgrade R to 4.0.5 --- .ci/test_r_package.sh | 4 ++-- .ci/test_r_package_windows.ps1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index d8932ee6a834..a3dd93ed13ff 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -33,8 +33,8 @@ if [[ "${R_MAJOR_VERSION}" == "3" ]]; then export R_LINUX_VERSION="3.6.3-1bionic" export R_APT_REPO="bionic-cran35/" elif [[ "${R_MAJOR_VERSION}" == "4" ]]; then - export R_MAC_VERSION=4.0.4 - export R_LINUX_VERSION="4.0.4-1.1804.0" + export R_MAC_VERSION=4.0.5 + export R_LINUX_VERSION="4.0.5-1.1804.0" export R_APT_REPO="bionic-cran40/" else echo "Unrecognized R version: ${R_VERSION}" diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1 index ac9410a823c7..d260f52af9e1 100644 --- a/.ci/test_r_package_windows.ps1 +++ b/.ci/test_r_package_windows.ps1 @@ -66,7 +66,7 @@ if ($env:R_MAJOR_VERSION -eq "3") { $env:RTOOLS_BIN = "$RTOOLS_INSTALL_PATH\usr\bin" $env:RTOOLS_MINGW_BIN = "$RTOOLS_INSTALL_PATH\mingw64\bin" $env:RTOOLS_EXE_FILE = "rtools40-x86_64.exe" - $env:R_WINDOWS_VERSION = "4.0.4" + $env:R_WINDOWS_VERSION = "4.0.5" } else { Write-Output "[ERROR] Unrecognized R version: $env:R_VERSION" Check-Output $false From ce6fe771ac35979b1ad3685ffbe3940d7c67627b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 5 Apr 2021 21:35:12 -0500 Subject: [PATCH 2/2] get R 4.0.5 from focal repo --- .ci/test_r_package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh index a3dd93ed13ff..23123315323c 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -34,8 +34,8 @@ if [[ "${R_MAJOR_VERSION}" == "3" ]]; then export R_APT_REPO="bionic-cran35/" elif [[ "${R_MAJOR_VERSION}" == "4" ]]; then export R_MAC_VERSION=4.0.5 - export R_LINUX_VERSION="4.0.5-1.1804.0" - export R_APT_REPO="bionic-cran40/" + export R_LINUX_VERSION="4.0.5-1.2004.0" + export R_APT_REPO="focal-cran40/" else echo "Unrecognized R version: ${R_VERSION}" exit -1