From 650b6dac5e94a9d0c013644b08d1f0e721dc0459 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 28 May 2021 18:35:50 +0300 Subject: [PATCH 1/4] Update test_r_package_windows.ps1 --- .ci/test_r_package_windows.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1 index 47357fa79821..1d04ef498448 100644 --- a/.ci/test_r_package_windows.ps1 +++ b/.ci/test_r_package_windows.ps1 @@ -65,8 +65,8 @@ if ($env:R_MAJOR_VERSION -eq "3") { $RTOOLS_INSTALL_PATH = "C:\rtools40" $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.5" + $env:RTOOLS_EXE_FILE = "rtools40v2-x86_64.exe" + $env:R_WINDOWS_VERSION = "4.1.0" } else { Write-Output "[ERROR] Unrecognized R version: $env:R_VERSION" Check-Output $false From 1f0da52359e9887e57f6de3a3646bbb4e1c01a77 Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 28 May 2021 18:41:07 +0300 Subject: [PATCH 2/4] Update test_r_package.sh --- .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 1f5029543dc0..a9255c97f2a5 100755 --- a/.ci/test_r_package.sh +++ b/.ci/test_r_package.sh @@ -20,8 +20,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.5 - export R_LINUX_VERSION="4.0.5-1.2004.0" + export R_MAC_VERSION=4.1.0 + export R_LINUX_VERSION="4.1.0-1.2004.0" export R_APT_REPO="focal-cran40/" else echo "Unrecognized R version: ${R_VERSION}" From cb2ba20f77d9976550036a9053d0839d864c3e1a Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 28 May 2021 18:42:44 +0300 Subject: [PATCH 3/4] Update r_package.yml --- .github/workflows/r_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r_package.yml b/.github/workflows/r_package.yml index 3e0acd8631c2..585a36a92ca4 100644 --- a/.github/workflows/r_package.yml +++ b/.github/workflows/r_package.yml @@ -3,7 +3,7 @@ name: R-package on: push: branches: - - master + - r41 pull_request: branches: - master From cb9ce5a9cd490939dcd0c664622bca1982788dca Mon Sep 17 00:00:00 2001 From: Nikita Titov Date: Fri, 28 May 2021 19:07:18 +0300 Subject: [PATCH 4/4] Update r_package.yml --- .github/workflows/r_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r_package.yml b/.github/workflows/r_package.yml index 585a36a92ca4..3e0acd8631c2 100644 --- a/.github/workflows/r_package.yml +++ b/.github/workflows/r_package.yml @@ -3,7 +3,7 @@ name: R-package on: push: branches: - - r41 + - master pull_request: branches: - master