Skip to content

Commit

Permalink
[ci] update to R 4.1.3 and use macOS-latest for R jobs (fixes #4990) (#…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
jameslamb authored Apr 10, 2022
1 parent 5f57d6c commit b462d0a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .ci/test_r_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion .ci/test_r_package_windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/r_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b462d0a

Please sign in to comment.