Skip to content

Commit

Permalink
Propagate renv.lock from pharmaverse/admiralci (#1938)
Browse files Browse the repository at this point in the history
* renv update from pharmaverse/admiralci

* renv update from pharmaverse/admiralci

* Run workflows

---------

Co-authored-by: dgrassellyb <[email protected]>
Co-authored-by: Ben Straub <[email protected]>
Co-authored-by: cicdguy <[email protected]>
Co-authored-by: cicdguy <[email protected]>
  • Loading branch information
5 people authored Jun 6, 2023
1 parent af4aeab commit c8963f4
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 69 deletions.
21 changes: 10 additions & 11 deletions .Rprofile
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# Set renv profile base on R version.
renv_profile <- paste(R.version$major, substr(R.version$minor, 1, 1), sep = ".")
if (file.exists("./renv/profile")) {
message("Using renv profile from `renv/profile` file.")
} else if (renv_profile %in% c("4.1", "4.2", "4.3")) {
message("Set renv profile to `", renv_profile, "`")
Sys.setenv("RENV_PROFILE" = renv_profile)
} else {
message("This repository do not contains the renv profile for your R version.")
}

if (Sys.getenv("GITHUB_ACTIONS") == "") {
if ((Sys.getenv("GITHUB_ACTIONS") == "") && (Sys.getenv("DOCKER_CONTAINER_CONTEXT") == "")) {
renv_profile <- paste(R.version$major, substr(R.version$minor, 1, 1), sep = ".")
if (file.exists("./renv/profile")) {
message("Using renv profile from `renv/profile` file.")
} else if (renv_profile %in% c("4.1", "4.2", "4.3")) {
message("Set renv profile to `", renv_profile, "`")
Sys.setenv("RENV_PROFILE" = renv_profile)
} else {
message("This repository do not contains the renv profile for your R version.")
}
source("renv/activate.R")
} else {
options(repos = c(CRAN = "https://cran.rstudio.com"))
Expand Down
49 changes: 25 additions & 24 deletions renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,13 @@
},
"dplyr": {
"Package": "dplyr",
"Version": "1.0.8",
"Version": "1.1.1",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"R6",
"cli",
"generics",
"glue",
"lifecycle",
Expand All @@ -439,7 +440,7 @@
"utils",
"vctrs"
],
"Hash": "ef47665e64228a17609d6df877bf86f2"
"Hash": "eb5742d256a0d9306d85ea68756d8187"
},
"ellipsis": {
"Package": "ellipsis",
Expand Down Expand Up @@ -739,15 +740,16 @@
},
"lifecycle": {
"Package": "lifecycle",
"Version": "1.0.1",
"Version": "1.0.3",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"cli",
"glue",
"rlang"
],
"Hash": "a6b6d352e3ed897373ab19d8395c98d0"
"Hash": "001cecbeac1cff9301bdc3775ee46a86"
},
"lintr": {
"Package": "lintr",
Expand Down Expand Up @@ -837,13 +839,11 @@
},
"pillar": {
"Package": "pillar",
"Version": "1.7.0",
"Version": "1.9.0",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"cli",
"crayon",
"ellipsis",
"fansi",
"glue",
"lifecycle",
Expand All @@ -852,7 +852,7 @@
"utils",
"vctrs"
],
"Hash": "51dfc97e1b7069e9f7e6f83f3589c22e"
"Hash": "15da5a8412f317beeee6175fbc76f4bb"
},
"pkgbuild": {
"Package": "pkgbuild",
Expand Down Expand Up @@ -1084,14 +1084,14 @@
},
"rlang": {
"Package": "rlang",
"Version": "1.0.6",
"Version": "1.1.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"utils"
],
"Hash": "4ed1f8336c8d52c3e750adcdc57228a7"
"Hash": "dc079ccd156cde8647360f473c1fa718"
},
"rmarkdown": {
"Package": "rmarkdown",
Expand Down Expand Up @@ -1394,12 +1394,11 @@
},
"tibble": {
"Package": "tibble",
"Version": "3.1.6",
"Version": "3.2.0",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"ellipsis",
"fansi",
"lifecycle",
"magrittr",
Expand All @@ -1410,7 +1409,7 @@
"utils",
"vctrs"
],
"Hash": "8a8f02d1934dfd6431c671361510dd0b"
"Hash": "37695ff125982007d42a59ad10982ff2"
},
"tidyr": {
"Package": "tidyr",
Expand All @@ -1436,18 +1435,19 @@
},
"tidyselect": {
"Package": "tidyselect",
"Version": "1.1.2",
"Version": "1.2.0",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"ellipsis",
"cli",
"glue",
"purrr",
"lifecycle",
"rlang",
"vctrs"
"vctrs",
"withr"
],
"Hash": "17f6da8cfd7002760a859915ce7eef8f"
"Hash": "79540e5fcd9e0435af547d885f184fd5"
},
"tinytex": {
"Package": "tinytex",
Expand Down Expand Up @@ -1502,16 +1502,17 @@
},
"vctrs": {
"Package": "vctrs",
"Version": "0.4.1",
"Version": "0.6.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"cli",
"glue",
"lifecycle",
"rlang"
],
"Hash": "8b54f22e2a58c4f275479c92ce041a57"
"Hash": "7e877404388794361277be95d8445de8"
},
"waldo": {
"Package": "waldo",
Expand Down
51 changes: 26 additions & 25 deletions renv/profiles/4.1/renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,13 @@
},
"dplyr": {
"Package": "dplyr",
"Version": "1.0.8",
"Version": "1.1.1",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"R6",
"cli",
"generics",
"glue",
"lifecycle",
Expand All @@ -439,7 +440,7 @@
"utils",
"vctrs"
],
"Hash": "ef47665e64228a17609d6df877bf86f2"
"Hash": "eb5742d256a0d9306d85ea68756d8187"
},
"ellipsis": {
"Package": "ellipsis",
Expand Down Expand Up @@ -739,15 +740,16 @@
},
"lifecycle": {
"Package": "lifecycle",
"Version": "1.0.1",
"Version": "1.0.3",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"cli",
"glue",
"rlang"
],
"Hash": "a6b6d352e3ed897373ab19d8395c98d0"
"Hash": "001cecbeac1cff9301bdc3775ee46a86"
},
"lintr": {
"Package": "lintr",
Expand Down Expand Up @@ -837,13 +839,11 @@
},
"pillar": {
"Package": "pillar",
"Version": "1.7.0",
"Version": "1.9.0",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"cli",
"crayon",
"ellipsis",
"fansi",
"glue",
"lifecycle",
Expand All @@ -852,7 +852,7 @@
"utils",
"vctrs"
],
"Hash": "51dfc97e1b7069e9f7e6f83f3589c22e"
"Hash": "15da5a8412f317beeee6175fbc76f4bb"
},
"pkgbuild": {
"Package": "pkgbuild",
Expand Down Expand Up @@ -1084,14 +1084,14 @@
},
"rlang": {
"Package": "rlang",
"Version": "1.0.6",
"Version": "1.1.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"utils"
],
"Hash": "4ed1f8336c8d52c3e750adcdc57228a7"
"Hash": "dc079ccd156cde8647360f473c1fa718"
},
"rmarkdown": {
"Package": "rmarkdown",
Expand Down Expand Up @@ -1394,12 +1394,11 @@
},
"tibble": {
"Package": "tibble",
"Version": "3.1.6",
"Version": "3.2.0",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"ellipsis",
"fansi",
"lifecycle",
"magrittr",
Expand All @@ -1410,7 +1409,7 @@
"utils",
"vctrs"
],
"Hash": "8a8f02d1934dfd6431c671361510dd0b"
"Hash": "37695ff125982007d42a59ad10982ff2"
},
"tidyr": {
"Package": "tidyr",
Expand All @@ -1436,18 +1435,19 @@
},
"tidyselect": {
"Package": "tidyselect",
"Version": "1.1.2",
"Version": "1.2.0",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"ellipsis",
"cli",
"glue",
"purrr",
"lifecycle",
"rlang",
"vctrs"
"vctrs",
"withr"
],
"Hash": "17f6da8cfd7002760a859915ce7eef8f"
"Hash": "79540e5fcd9e0435af547d885f184fd5"
},
"tinytex": {
"Package": "tinytex",
Expand Down Expand Up @@ -1502,16 +1502,17 @@
},
"vctrs": {
"Package": "vctrs",
"Version": "0.4.1",
"Version": "0.6.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"cli",
"glue",
"lifecycle",
"rlang"
],
"Hash": "8b54f22e2a58c4f275479c92ce041a57"
"Hash": "7e877404388794361277be95d8445de8"
},
"waldo": {
"Package": "waldo",
Expand Down
Loading

0 comments on commit c8963f4

Please sign in to comment.