Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Apr 10, 2022
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81daa36
[ci] update to R 4.1.3 and use macOS-latest for R jobs (fixes #4990)
jameslamb Apr 9, 2022
289c80f
update Windows version
jameslamb Apr 9, 2022
a04c5db
update docs env
jameslamb Apr 9, 2022
2f81f1a
Merge branch 'master' into r-mac-ci
jameslamb Apr 10, 2022
5689ff3
simplify r-package config
jameslamb Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/test_r_package.sh
View file
Open in desktop
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
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions .github/workflows/r_package.yml
View file
Open in desktop
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 Down
2 changes: 1 addition & 1 deletion docs/env.yml
View file
Open in desktop
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