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

[ci] test against R 4.2 for macOS and Linux CI jobs (#5484)

parent 6d4d1abc
...@@ -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.3 export R_MAC_VERSION=4.2.1
export R_MAC_PKG_URL=${CRAN_MIRROR}/bin/macosx/base/R-${R_MAC_VERSION}.pkg export R_MAC_PKG_URL=${CRAN_MIRROR}/bin/macosx/base/R-${R_MAC_VERSION}.pkg
export R_LINUX_VERSION="4.1.3-1.2004.0" export R_LINUX_VERSION="4.2.1-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}"
......
...@@ -40,7 +40,7 @@ jobs: ...@@ -40,7 +40,7 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
task: r-package task: r-package
compiler: gcc compiler: gcc
r_version: 4.1 r_version: 4.2
build_type: cmake build_type: cmake
- os: ubuntu-latest - os: ubuntu-latest
task: r-package task: r-package
...@@ -50,7 +50,7 @@ jobs: ...@@ -50,7 +50,7 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
task: r-package task: r-package
compiler: clang compiler: clang
r_version: 4.1 r_version: 4.2
build_type: cmake build_type: cmake
- os: macOS-latest - os: macOS-latest
task: r-package task: r-package
...@@ -60,7 +60,7 @@ jobs: ...@@ -60,7 +60,7 @@ jobs:
- os: macOS-latest - os: macOS-latest
task: r-package task: r-package
compiler: gcc compiler: gcc
r_version: 4.1 r_version: 4.2
build_type: cmake build_type: cmake
- os: macOS-latest - os: macOS-latest
task: r-package task: r-package
...@@ -70,7 +70,7 @@ jobs: ...@@ -70,7 +70,7 @@ jobs:
- os: macOS-latest - os: macOS-latest
task: r-package task: r-package
compiler: clang compiler: clang
r_version: 4.1 r_version: 4.2
build_type: cmake build_type: cmake
- os: windows-latest - os: windows-latest
task: r-package task: r-package
...@@ -116,12 +116,12 @@ jobs: ...@@ -116,12 +116,12 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
task: r-package task: r-package
compiler: gcc compiler: gcc
r_version: 4.1 r_version: 4.2
build_type: cran build_type: cran
- os: macOS-latest - os: macOS-latest
task: r-package task: r-package
compiler: clang compiler: clang
r_version: 4.1 r_version: 4.2
build_type: cran build_type: cran
################ ################
# Other checks # # Other checks #
...@@ -129,7 +129,7 @@ jobs: ...@@ -129,7 +129,7 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
task: r-rchk task: r-rchk
compiler: gcc compiler: gcc
r_version: 4.1 r_version: 4.2
build_type: cran build_type: cran
steps: steps:
- name: Prevent conversion of line endings on Windows - name: Prevent conversion of line endings on Windows
......
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