Unverified Commit b462d0a4 authored by James Lamb's avatar James Lamb Committed by GitHub
Browse files

[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
parent 5f57d6c6
...@@ -21,9 +21,9 @@ if [[ "${R_MAJOR_VERSION}" == "3" ]]; then ...@@ -21,9 +21,9 @@ if [[ "${R_MAJOR_VERSION}" == "3" ]]; then
export R_LINUX_VERSION="3.6.3-1bionic" export R_LINUX_VERSION="3.6.3-1bionic"
export R_APT_REPO="bionic-cran35/" export R_APT_REPO="bionic-cran35/"
elif [[ "${R_MAJOR_VERSION}" == "4" ]]; then 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_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/" export R_APT_REPO="focal-cran40/"
else else
echo "Unrecognized R version: ${R_VERSION}" echo "Unrecognized R version: ${R_VERSION}"
......
...@@ -78,7 +78,7 @@ if ($env:R_MAJOR_VERSION -eq "3") { ...@@ -78,7 +78,7 @@ if ($env:R_MAJOR_VERSION -eq "3") {
$env:RTOOLS_BIN = "$RTOOLS_INSTALL_PATH\usr\bin" $env:RTOOLS_BIN = "$RTOOLS_INSTALL_PATH\usr\bin"
$env:RTOOLS_MINGW_BIN = "$RTOOLS_INSTALL_PATH\mingw64\bin" $env:RTOOLS_MINGW_BIN = "$RTOOLS_INSTALL_PATH\mingw64\bin"
$env:RTOOLS_EXE_FILE = "rtools40v2-x86_64.exe" $env:RTOOLS_EXE_FILE = "rtools40v2-x86_64.exe"
$env:R_WINDOWS_VERSION = "4.1.2" $env:R_WINDOWS_VERSION = "4.1.3"
} else { } else {
Write-Output "[ERROR] Unrecognized R version: $env:R_VERSION" Write-Output "[ERROR] Unrecognized R version: $env:R_VERSION"
Check-Output $false Check-Output $false
......
...@@ -57,7 +57,7 @@ jobs: ...@@ -57,7 +57,7 @@ jobs:
compiler: gcc compiler: gcc
r_version: 3.6 r_version: 3.6
build_type: cmake build_type: cmake
- os: macOS-10.15 - os: macOS-latest
task: r-package task: r-package
compiler: gcc compiler: gcc
r_version: 4.1 r_version: 4.1
...@@ -67,7 +67,7 @@ jobs: ...@@ -67,7 +67,7 @@ jobs:
compiler: clang compiler: clang
r_version: 3.6 r_version: 3.6
build_type: cmake build_type: cmake
- os: macOS-10.15 - os: macOS-latest
task: r-package task: r-package
compiler: clang compiler: clang
r_version: 4.1 r_version: 4.1
...@@ -112,7 +112,7 @@ jobs: ...@@ -112,7 +112,7 @@ jobs:
compiler: gcc compiler: gcc
r_version: 4.1 r_version: 4.1
build_type: cran build_type: cran
- os: macOS-10.15 - os: macOS-latest
task: r-package task: r-package
compiler: clang compiler: clang
r_version: 4.1 r_version: 4.1
...@@ -138,13 +138,13 @@ jobs: ...@@ -138,13 +138,13 @@ jobs:
- name: Install pandoc - name: Install pandoc
uses: r-lib/actions/setup-pandoc@v1 uses: r-lib/actions/setup-pandoc@v1
- name: Setup and run tests on Linux and macOS - 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 shell: bash
run: | run: |
export TASK="${{ matrix.task }}" export TASK="${{ matrix.task }}"
export COMPILER="${{ matrix.compiler }}" export COMPILER="${{ matrix.compiler }}"
export GITHUB_ACTIONS="true" export GITHUB_ACTIONS="true"
if [[ $(echo "${{ matrix.os }}" | head -c5) == "macOS" ]]; then if [[ "${{ matrix.os }}" == "macOS-latest" ]]; then
export OS_NAME="macos" export OS_NAME="macos"
elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then elif [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
export OS_NAME="linux" export OS_NAME="linux"
......
...@@ -5,7 +5,7 @@ channels: ...@@ -5,7 +5,7 @@ channels:
dependencies: dependencies:
- breathe - breathe
- python=3.9 - python=3.9
- r-base=4.1.2 - r-base=4.1.3
- r-data.table=1.14.2 - r-data.table=1.14.2
- r-jsonlite=1.7.2 - r-jsonlite=1.7.2
- r-knitr=1.37 - r-knitr=1.37
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment