Skip to content

Commit c28786a

Browse files
committed
Merge branch 'master' into last_narm
2 parents 2aed4cc + e9a323d commit c28786a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ build: ## build data.table sources as tar.gz archive
9494
- mkdir.exe -p cran/bin/windows/contrib/$R_VERSION; mv.exe $(ls.exe -1t data.table_*.zip | head.exe -n 1) cran/bin/windows/contrib/$R_VERSION
9595

9696
.test-install-r-rel-win: &install-r-rel-win
97-
- curl.exe -s -o ../R-rel.exe https://cloud.r-project.org/bin/windows/base/R-4.1.2-win.exe; Start-Process -FilePath ..\R-rel.exe -ArgumentList "/VERYSILENT /DIR=C:\R" -NoNewWindow -Wait
97+
- curl.exe -s -o ../R-rel.exe https://cloud.r-project.org/bin/windows/base/R-4.1.3-win.exe; Start-Process -FilePath ..\R-rel.exe -ArgumentList "/VERYSILENT /DIR=C:\R" -NoNewWindow -Wait
9898
# see #5198 for discussion about the https link used above; it will break each time R is released and the version number will need to be updated
9999
.test-install-r-devel-win: &install-r-devel-win
100100
- curl.exe -s -o ../R-devel.exe https://cloud.r-project.org/bin/windows/base/R-devel-win.exe; Start-Process -FilePath ..\R-devel.exe -ArgumentList "/VERYSILENT /DIR=C:\R" -NoNewWindow -Wait
@@ -264,7 +264,7 @@ test-dev-win: ## R-devel on Windows; see #5294 for changes in Dec 2021 related t
264264
R_VERSION: "$R_DEVEL_VERSION"
265265
before_script:
266266
- *install-r-devel-win
267-
- curl.exe -s -o ../rtools.exe https://www.r-project.org/nosvn/winutf8/ucrt3/rtools42-4911-4926.exe; Start-Process -FilePath ..\rtools.exe -ArgumentList "/VERYSILENT /DIR=C:\rtools42" -NoNewWindow -Wait
267+
- curl.exe -s -o ../rtools.exe https://www.r-project.org/nosvn/winutf8/ucrt3/rtools42-5038-5046.exe; Start-Process -FilePath ..\rtools.exe -ArgumentList "/VERYSILENT /DIR=C:\rtools42" -NoNewWindow -Wait
268268
- $ENV:PATH = "C:\R\bin;C:\rtools42\usr\bin;$ENV:PATH"
269269
- Rscript.exe -e "source('.ci/ci.R'); install.packages(dcf.dependencies('DESCRIPTION', which='most', exclude=c('knitr','rmarkdown')), quiet=TRUE)" ## exclude= for #5294
270270
- *cp-src-win

0 commit comments

Comments
 (0)