Merge pull request #188 from pharmaverse/automated-renv-lock-propagat…

…ion@devel Propagate renv.lock from pharmaverse/admiralci
pharmaverse · Sep 8, 2023 · a1dba9d · a1dba9d
2 parents e56587a + 0562d6c
commit a1dba9d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git 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)

diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -5,7 +5,8 @@
     "admiral",
     "admiraldev",
     "admiral.test",
-    "admiralci"
+    "admiralci",
+    "pharmaversesdtm"
   ],
   "package.dependency.fields": [
     "Imports",