Skip to content

Commit 9757bdf

Browse files
authored
change appveyor to x64 since 32bit windows support dropped in R 4.2 (#5398)
1 parent 9689f9e commit 9757bdf

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

.appveyor.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,13 @@ environment:
1616
global:
1717
CRAN: http://cloud.r-project.org
1818
WARNINGS_ARE_ERRORS: 1
19-
R_CHECK_ARGS: --no-manual --no-multiarch
20-
R_ARCH: i386
19+
R_CHECK_ARGS: --no-manual
2120
# R_CHECK_ARGS specified in order to turn off --as-cran (on by default) as that can be slow
22-
# multiarch is on by default which (when R_ARCH: x64) compiles and tests both 32bit and 64bit in one x64 job
23-
# --no-multiarch so as to not run both 32bit and 64bit on every commit in PRs to save dev cycle time; GLCI after merge is full-strength
24-
# GHA has MacOS 64bit (test-coverage) and Ubuntu 64bit, therefore picked 32bit for Windows
25-
GCC_PATH: mingw_64
26-
# Default GCC_PATH appears to be gcc-4.6.3 which is now unsupported as from Rtools.exe v3.4.
2721
_R_CHECK_NO_STOP_ON_TEST_ERROR_: true
2822
# continue tests even if some script failed
2923
_R_CHECK_TESTS_NLINES_: 0
3024
# Block truncation of any error messages in R CMD check
25+
# R is 64-bit only on Windows from 4.2.0 (prior default was build and test both 32bit and 64bit) so we no longer use R_ARCH to pick one to reduce CI time in PRs
3126

3227
matrix:
3328

inst/tests/tests.Rraw

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14600,11 +14600,11 @@ oldenv1 = Sys.getenv("R_DATATABLE_NUM_PROCS_PERCENT")
1460014600
oldenv2 = Sys.getenv("R_DATATABLE_NUM_THREADS")
1460114601
Sys.setenv(R_DATATABLE_NUM_THREADS="") # in case user has this set, so we can test PROCS_PERCENT
1460214602
Sys.setenv(R_DATATABLE_NUM_PROCS_PERCENT="3.0")
14603-
test(1997.09, setDTthreads(), old, warning="Ignoring invalid.*Please remove any.*not a digit")
14603+
test(1997.09, setDTthreads(), old, ignore.warning="Ignoring invalid.*Please remove any.*not a digit")
1460414604
new = getDTthreads() # old above at (1) may not have been default. new now is.
1460514605
test(1997.10, getDTthreads(), new)
1460614606
Sys.setenv(R_DATATABLE_NUM_PROCS_PERCENT="1")
14607-
test(1997.11, setDTthreads(), new, warning="Ignoring invalid.*integer between 2 and 100")
14607+
test(1997.11, setDTthreads(), new, ignore.warning="Ignoring invalid.*integer between 2 and 100")
1460814608
test(1997.12, getDTthreads(), new)
1460914609
Sys.setenv(R_DATATABLE_NUM_PROCS_PERCENT="75")
1461014610
test(1997.13, setDTthreads(), new)

0 commit comments

Comments
 (0)