From b462d0a40f6978c0a66a47af4522c2ae12532316 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Sat, 9 Apr 2022 22:57:19 -0500
Subject: [PATCH] [ci] update to R 4.1.3 and use macOS-latest for R jobs (fixes
 #4990) (#5137)

* [ci] update to R 4.1.3 and use macOS-latest for R jobs (fixes #4990)

* update Windows version

* update docs env

* simplify r-package config
---
 .ci/test_r_package.sh           |  4 ++--
 .ci/test_r_package_windows.ps1  |  2 +-
 .github/workflows/r_package.yml | 10 +++++-----
 docs/env.yml                    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.ci/test_r_package.sh b/.ci/test_r_package.sh
index a6d6a0b475b0..3e8c203581a1 100755
--- a/.ci/test_r_package.sh
+++ b/.ci/test_r_package.sh
@@ -21,9 +21,9 @@ 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.1.2
+    export R_MAC_VERSION=4.1.3
     export R_MAC_PKG_URL=https://cran.r-project.org/bin/macosx/base/R-${R_MAC_VERSION}.pkg
-    export R_LINUX_VERSION="4.1.2-1.2004.0"
+    export R_LINUX_VERSION="4.1.3-1.2004.0"
     export R_APT_REPO="focal-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 4a911ca77c2e..d830e4216071 100644
--- a/.ci/test_r_package_windows.ps1
+++ b/.ci/test_r_package_windows.ps1
@@ -78,7 +78,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 = "rtools40v2-x86_64.exe"
-  $env:R_WINDOWS_VERSION = "4.1.2"
+  $env:R_WINDOWS_VERSION = "4.1.3"
 } else {
   Write-Output "[ERROR] Unrecognized R version: $env:R_VERSION"
   Check-Output $false
diff --git a/.github/workflows/r_package.yml b/.github/workflows/r_package.yml
index 87c05401caa5..ee73b379e59f 100644
--- a/.github/workflows/r_package.yml
+++ b/.github/workflows/r_package.yml
@@ -57,7 +57,7 @@ jobs:
             compiler: gcc
             r_version: 3.6
             build_type: cmake
-          - os: macOS-10.15
+          - os: macOS-latest
             task: r-package
             compiler: gcc
             r_version: 4.1
@@ -67,7 +67,7 @@ jobs:
             compiler: clang
             r_version: 3.6
             build_type: cmake
-          - os: macOS-10.15
+          - os: macOS-latest
             task: r-package
             compiler: clang
             r_version: 4.1
@@ -112,7 +112,7 @@ jobs:
             compiler: gcc
             r_version: 4.1
             build_type: cran
-          - os: macOS-10.15
+          - os: macOS-latest
             task: r-package
             compiler: clang
             r_version: 4.1
@@ -138,13 +138,13 @@ jobs:
       - name: Install pandoc
         uses: r-lib/actions/setup-pandoc@v1
       - name: Setup and run tests on Linux and macOS
-        if: startsWith(matrix.os, 'macOS') || matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'macOS-latest' || matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           export TASK="${{ matrix.task }}"
           export COMPILER="${{ matrix.compiler }}"
           export GITHUB_ACTIONS="true"
-          if [[ $(echo "${{ matrix.os }}" | head -c5) == "macOS" ]]; then
+          if [[ "${{ matrix.os }}" == "macOS-latest" ]]; then
               export OS_NAME="macos"
           elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
               export OS_NAME="linux"
diff --git a/docs/env.yml b/docs/env.yml
index da35a3264900..58c2cd155c7a 100644
--- a/docs/env.yml
+++ b/docs/env.yml
@@ -5,7 +5,7 @@ channels:
 dependencies:
   - breathe
   - python=3.9
-  - r-base=4.1.2
+  - r-base=4.1.3
   - r-data.table=1.14.2
   - r-jsonlite=1.7.2
   - r-knitr=1.37