[R] Bump requirement to 4.3.0. (#9847)
This commit is contained in:
parent
1de3f4135c
commit
4bc1f3a388
6
.github/workflows/r_tests.yml
vendored
6
.github/workflows/r_tests.yml
vendored
@ -25,7 +25,7 @@ jobs:
|
||||
with:
|
||||
submodules: 'true'
|
||||
|
||||
- uses: r-lib/actions/setup-r@11a22a908006c25fe054c4ef0ac0436b1de3edbe # v2.6.4
|
||||
- uses: r-lib/actions/setup-r@e40ad904310fc92e96951c1b0d64f3de6cbe9e14 # v2.6.5
|
||||
with:
|
||||
r-version: ${{ matrix.config.r }}
|
||||
|
||||
@ -54,7 +54,7 @@ jobs:
|
||||
matrix:
|
||||
config:
|
||||
- {os: windows-latest, r: 'release', compiler: 'mingw', build: 'autotools'}
|
||||
- {os: windows-latest, r: '4.2.0', compiler: 'msvc', build: 'cmake'}
|
||||
- {os: windows-latest, r: '4.3.0', compiler: 'msvc', build: 'cmake'}
|
||||
env:
|
||||
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
|
||||
RSPM: ${{ matrix.config.rspm }}
|
||||
@ -64,7 +64,7 @@ jobs:
|
||||
with:
|
||||
submodules: 'true'
|
||||
|
||||
- uses: r-lib/actions/setup-r@11a22a908006c25fe054c4ef0ac0436b1de3edbe # v2.6.4
|
||||
- uses: r-lib/actions/setup-r@e40ad904310fc92e96951c1b0d64f3de6cbe9e14 # v2.6.5
|
||||
with:
|
||||
r-version: ${{ matrix.config.r }}
|
||||
|
||||
|
||||
@ -14,6 +14,15 @@ if(ENABLE_ALL_WARNINGS)
|
||||
target_compile_options(xgboost-r PRIVATE -Wall -Wextra)
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
# https://github.com/microsoft/LightGBM/pull/6061
|
||||
# MSVC doesn't work with anonymous types in structs. (R complex)
|
||||
#
|
||||
# syntax error: missing ';' before identifier 'private_data_c'
|
||||
#
|
||||
target_compile_definitions(xgboost-r PRIVATE -DR_LEGACY_RCOMPLEX)
|
||||
endif()
|
||||
|
||||
target_compile_definitions(
|
||||
xgboost-r PUBLIC
|
||||
-DXGBOOST_STRICT_R_MODE=1
|
||||
|
||||
@ -58,7 +58,7 @@ Suggests:
|
||||
float,
|
||||
titanic
|
||||
Depends:
|
||||
R (>= 3.3.0)
|
||||
R (>= 4.3.0)
|
||||
Imports:
|
||||
Matrix (>= 1.1-0),
|
||||
methods,
|
||||
|
||||
@ -261,6 +261,8 @@ def test_with_cmake(args: argparse.Namespace) -> None:
|
||||
"-DCMAKE_CONFIGURATION_TYPES=Release",
|
||||
"-A",
|
||||
"x64",
|
||||
"-G",
|
||||
"Visual Studio 17 2022",
|
||||
]
|
||||
)
|
||||
subprocess.check_call(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user