Skip to content

Commit 30332b7

Browse files
committed
Deploy: install embedded curl on Windows
curl 7.1.0 fails on older R, curl 5.2.x (without patching) fails on newer R, so let's use the embedded version, that should work. [ci skip]
1 parent d05562e commit 30332b7

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Config/Needs/website:
128128
tidyverse/tidytemplate
129129
Config/Needs/deploy:
130130
cli (>= 3.2.0),
131-
curl@5.2.3,
131+
curl,
132132
desc,
133133
gitcreds,
134134
glue@1.6.2,

tools/build/windows/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ export PKGFILES := $(patsubst %,lib/%/pak_$(PAKVERSION).zip,$(RVERSIONS))
4343
deploy:
4444
@echo "----- DEPLOYING packages -----------------------------------"
4545
@echo $(PKGFILES)
46+
R_LIBS=$(RLIB) $(R) -q -e \
47+
"install.packages('$(PKGROOT)/src/library/curl', type = 'source', repos = NULL)"
4648
R_LIBS=$(RLIB) $(R) -q -e \
4749
"options(repos = c(CRAN = 'https://cloud.r-project.org')); pak::pkg_install('deps::$(PKGROOT)', dependencies = 'Config/Needs/deploy')"
4850
R_LIBS=$(RLIB) $(R) -q -e \

0 commit comments

Comments
 (0)