From b09d6601367d40dfb7535865a580c5bf97bb9094 Mon Sep 17 00:00:00 2001 From: galachad Date: Thu, 10 Aug 2023 16:21:15 +0000 Subject: [PATCH 1/3] renv / codespaces update from pharmaverse/admiralci --- .devcontainer/4.1/devcontainer.json | 3 ++- .devcontainer/4.2/devcontainer.json | 3 ++- .devcontainer/devcontainer.json | 3 ++- .devcontainer/postCreateCommand.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.devcontainer/4.1/devcontainer.json b/.devcontainer/4.1/devcontainer.json index f287993d..1d05f7fd 100644 --- a/.devcontainer/4.1/devcontainer.json +++ b/.devcontainer/4.1/devcontainer.json @@ -6,7 +6,8 @@ "containerEnv": { "ROOT": "true", "PASSWORD": "rstudio", - "DISABLE_AUTH": "true" + "DISABLE_AUTH": "true", + "RENV_AUTOLOADER_ENABLED": "false" }, "features": { "ghcr.io/rocker-org/devcontainer-features/r-rig:1": { diff --git a/.devcontainer/4.2/devcontainer.json b/.devcontainer/4.2/devcontainer.json index 9878fa4b..f30486e0 100644 --- a/.devcontainer/4.2/devcontainer.json +++ b/.devcontainer/4.2/devcontainer.json @@ -6,7 +6,8 @@ "containerEnv": { "ROOT": "true", "PASSWORD": "rstudio", - "DISABLE_AUTH": "true" + "DISABLE_AUTH": "true", + "RENV_AUTOLOADER_ENABLED": "false" }, "features": { "ghcr.io/rocker-org/devcontainer-features/r-rig:1": { diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index af6c75b9..4f49db8f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,8 @@ "containerEnv": { "ROOT": "true", "PASSWORD": "rstudio", - "DISABLE_AUTH": "true" + "DISABLE_AUTH": "true", + "RENV_AUTOLOADER_ENABLED": "false" }, "features": { "ghcr.io/rocker-org/devcontainer-features/r-rig:1": { diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh index 9c6aec29..9b9db23a 100644 --- a/.devcontainer/postCreateCommand.sh +++ b/.devcontainer/postCreateCommand.sh @@ -1,5 +1,5 @@ #!/bin/bash -R -q -e 'renv::activate(profile = paste(R.version$major, substr(R.version$minor, 1, 1), sep = ".")); renv::restore(); staged.dependencies::install_deps(staged.dependencies::dependency_table(project = ".", verbose = 1), verbose = 1);' +R -q -e 'renv::restore(lockfile = file.path("renv", "profiles", paste(R.version$major, substr(R.version$minor, 1, 1), sep = "."), "renv.lock")); staged.dependencies::install_deps(staged.dependencies::dependency_table(project = ".", verbose = 1), verbose = 1);' jq --arg folder "$(pwd)/" '. + { "initial_working_directory": $folder }' .devcontainer/rstudio-prefs.json > ~/.config/rstudio/rstudio-prefs.json From ee740f28f0f8ad4acf26e32652335883e64a58a8 Mon Sep 17 00:00:00 2001 From: galachad Date: Tue, 15 Aug 2023 16:31:57 +0000 Subject: [PATCH 2/3] renv / codespaces update from pharmaverse/admiralci --- .Rprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Rprofile b/.Rprofile index 51ad0fdc..d059c2fc 100644 --- a/.Rprofile +++ b/.Rprofile @@ -19,7 +19,7 @@ )) ) ) - packages[!(packages %in% c("admiral", "admiraldev", "admiralci", "admiral.test", getwd()))] + packages[!(packages %in% c("admiral", "admiraldev", "admiralci", "admiral.test", "pharmaversesdtm", getwd()))] } options(renv.snapshot.filter = .get_dependencies) From 22529df0fdc21e1a0825c652c5ff2598b45c13b8 Mon Sep 17 00:00:00 2001 From: galachad Date: Wed, 16 Aug 2023 14:29:56 +0000 Subject: [PATCH 3/3] renv / codespaces update from pharmaverse/admiralci --- renv/profiles/4.1/renv/settings.json | 3 ++- renv/profiles/4.2/renv/settings.json | 3 ++- renv/profiles/4.3/renv/settings.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/renv/profiles/4.1/renv/settings.json b/renv/profiles/4.1/renv/settings.json index 3462f3b0..4922677e 100644 --- a/renv/profiles/4.1/renv/settings.json +++ b/renv/profiles/4.1/renv/settings.json @@ -5,7 +5,8 @@ "admiral", "admiraldev", "admiral.test", - "admiralci" + "admiralci", + "pharmaversesdtm" ], "package.dependency.fields": [ "Imports", diff --git a/renv/profiles/4.2/renv/settings.json b/renv/profiles/4.2/renv/settings.json index 3462f3b0..4922677e 100644 --- a/renv/profiles/4.2/renv/settings.json +++ b/renv/profiles/4.2/renv/settings.json @@ -5,7 +5,8 @@ "admiral", "admiraldev", "admiral.test", - "admiralci" + "admiralci", + "pharmaversesdtm" ], "package.dependency.fields": [ "Imports", diff --git a/renv/profiles/4.3/renv/settings.json b/renv/profiles/4.3/renv/settings.json index 3462f3b0..4922677e 100644 --- a/renv/profiles/4.3/renv/settings.json +++ b/renv/profiles/4.3/renv/settings.json @@ -5,7 +5,8 @@ "admiral", "admiraldev", "admiral.test", - "admiralci" + "admiralci", + "pharmaversesdtm" ], "package.dependency.fields": [ "Imports",