Skip to content

Commit a9a3ba0

Browse files
committed
Merge remote-tracking branch 'origin/master' into ignore-win-env
2 parents bcd3693 + c410de9 commit a9a3ba0

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@ RSC_API_KEYS=vetiver-testing/rsconnect_api_keys.json
171171
dev:
172172
docker-compose up -d
173173
docker-compose exec -T rsconnect bash < vetiver-testing/setup-rsconnect/add-users.sh
174-
# curl fails with error 52 without a short sleep....
175-
sleep 5
176-
curl -s --retry 10 --retry-connrefused http://localhost:3939
177174
python vetiver-testing/setup-rsconnect/dump_api_keys.py $(RSC_API_KEYS)
178175

179176
dev-stop:

vetiver-testing/setup-rsconnect/rstudio-connect.gcfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ DefaultUserRole = publisher
1313

1414
[Python]
1515
Enabled = true
16-
Executable = /opt/python/3.8.10/bin/python
17-
Executable = /opt/python/3.9.5/bin/python
16+
Executable = /opt/python/3.8.17/bin/python
17+
Executable = /opt/python/3.9.17/bin/python
1818

1919
[RPackageRepository "CRAN"]
2020
URL = https://packagemanager.rstudio.com/cran/__linux__/bionic/latest

0 commit comments

Comments
 (0)