From ba2923b09dfc95cda63380d914f2b41568dc1832 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Sat, 17 Oct 2020 17:21:40 -0500
Subject: [PATCH 1/2] [ci] ignore R CMD CHECK warnings on new R version

---
 .ci/test_r_package.sh           | 8 +++++++-
 .ci/test_r_package_windows.ps1  | 2 +-
 .github/workflows/r_package.yml | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh
index 76c00821b81b..756043daceaa 100755
--- a/.ci/test_r_package.sh
+++ b/.ci/test_r_package.sh
@@ -187,7 +187,13 @@ if [[ $check_succeeded == "no" ]]; then
     exit -1
 fi
 
-if grep -q -R "WARNING" "$LOG_FILE_NAME"; then
+num_warnings=$(
+    cat ${LOG_FILE_NAME} \
+    | grep -q -R "WARNING" \
+    | grep -v "was built under R version" \
+    | wc -l
+)
+if [[ ${num_warnings} -gt 0 ]]; then
     echo "WARNINGS have been found by R CMD check!"
     exit -1
 fi
diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1
index ea8cd39a7a44..9644c870fd68 100644
--- a/.ci/test_r_package_windows.ps1
+++ b/.ci/test_r_package_windows.ps1
@@ -164,7 +164,7 @@ if ($env:COMPILER -ne "MSVC") {
       echo "ERRORs have been found by R CMD check!"
       Check-Output $False
   }
-  if (Get-Content "$LOG_FILE_NAME" | Select-String -Pattern "WARNING" -CaseSensitive -Quiet) {
+  if (Get-Content "$LOG_FILE_NAME" | Select-String -Pattern "WARNING" -CaseSensitive -Quiet | Select-String -Pattern "was built under R version" -NotMatch -CaseSensitive -Quiet) {
       echo "WARNINGS have been found by R CMD check!"
       Check-Output $False
   }
diff --git a/.github/workflows/r_package.yml b/.github/workflows/r_package.yml
index e26bd865bbbe..98ae1e36db9e 100644
--- a/.github/workflows/r_package.yml
+++ b/.github/workflows/r_package.yml
@@ -163,8 +163,7 @@ jobs:
     name: r-package (ubuntu-latest, R-devel, GCC ASAN/UBSAN)
     timeout-minutes: 60
     runs-on: ubuntu-latest
-    container:
-      image: rhub/rocker-gcc-san
+    container: rhub/rocker-gcc-san
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1

From 495b70037a3ff2fe13c8b169b5263a1d244039d3 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Sat, 17 Oct 2020 21:58:40 -0500
Subject: [PATCH 2/2] just update version

---
 .ci/test_r_package.sh          | 12 +++---------
 .ci/test_r_package_windows.ps1 |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh
index 756043daceaa..f38e516f5f4b 100755
--- a/.ci/test_r_package.sh
+++ b/.ci/test_r_package.sh
@@ -18,8 +18,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.2
-    export R_LINUX_VERSION="4.0.2-1.1804.0"
+    export R_MAC_VERSION=4.0.3
+    export R_LINUX_VERSION="4.0.3-1.1804.0"
     export R_APT_REPO="bionic-cran40/"
 else
     echo "Unrecognized R version: ${R_VERSION}"
@@ -187,13 +187,7 @@ if [[ $check_succeeded == "no" ]]; then
     exit -1
 fi
 
-num_warnings=$(
-    cat ${LOG_FILE_NAME} \
-    | grep -q -R "WARNING" \
-    | grep -v "was built under R version" \
-    | wc -l
-)
-if [[ ${num_warnings} -gt 0 ]]; then
+if grep -q -R "WARNING" "$LOG_FILE_NAME"; then
     echo "WARNINGS have been found by R CMD check!"
     exit -1
 fi
diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1
index 9644c870fd68..42548dd49838 100644
--- a/.ci/test_r_package_windows.ps1
+++ b/.ci/test_r_package_windows.ps1
@@ -43,7 +43,7 @@ if ($env:R_MAJOR_VERSION -eq "3") {
   $RTOOLS_INSTALL_PATH = "C:\rtools40"
   $env:RTOOLS_MINGW_BIN = "$RTOOLS_INSTALL_PATH/mingw64/bin"
   $env:RTOOLS_EXE_FILE = "rtools40-x86_64.exe"
-  $env:R_WINDOWS_VERSION = "4.0.2"
+  $env:R_WINDOWS_VERSION = "4.0.3"
 } else {
   Write-Output "[ERROR] Unrecognized R version: $env:R_VERSION"
   Check-Output $false
@@ -164,7 +164,7 @@ if ($env:COMPILER -ne "MSVC") {
       echo "ERRORs have been found by R CMD check!"
       Check-Output $False
   }
-  if (Get-Content "$LOG_FILE_NAME" | Select-String -Pattern "WARNING" -CaseSensitive -Quiet | Select-String -Pattern "was built under R version" -NotMatch -CaseSensitive -Quiet) {
+  if (Get-Content "$LOG_FILE_NAME" | Select-String -Pattern "WARNING" -CaseSensitive -Quiet) {
       echo "WARNINGS have been found by R CMD check!"
       Check-Output $False
   }