From 41c382bfc1128e0d65fecef24d16197847a07a84 Mon Sep 17 00:00:00 2001 From: m7pr Date: Wed, 9 Oct 2024 11:04:19 +0200 Subject: [PATCH 1/2] increase minimal version of renv and specify lookup_refs for the GitHub version --- .github/workflows/check.yaml | 4 ++++ .github/workflows/docs.yaml | 1 + .github/workflows/release.yaml | 4 ++++ .github/workflows/scheduled.yaml | 2 ++ DESCRIPTION | 2 +- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 03297d30fc..3a0c350517 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -50,6 +50,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv r-cmd-non-cran: name: R CMD Check (non-CRAN) 🧬 uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main @@ -79,6 +80,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv coverage: name: Coverage πŸ“” uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main @@ -95,6 +97,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv linter: if: github.event_name != 'push' name: SuperLinter πŸ¦Έβ€β™€οΈ @@ -114,6 +117,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv gitleaks: name: gitleaks πŸ’§ uses: insightsengineering/r.pkg.template/.github/workflows/gitleaks.yaml@main diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 7c3e2f9617..845d1ca1de 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -50,3 +50,4 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1f5cb83933..0bafc40357 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,6 +24,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv validation: name: R Package Validation report πŸ“ƒ needs: release @@ -39,6 +40,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv release: name: Create release πŸŽ‰ uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main @@ -71,6 +73,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv coverage: name: Coverage πŸ“” needs: [release, docs] @@ -88,6 +91,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv wasm: name: Build WASM packages πŸ§‘β€πŸ­ needs: release diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 104b05f4b0..5988285e7c 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -64,6 +64,7 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv rhub: if: > github.event_name == 'schedule' || ( @@ -80,3 +81,4 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets + rstudio/renv diff --git a/DESCRIPTION b/DESCRIPTION index 05ae82a051..511df6f890 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -59,7 +59,7 @@ Suggests: mirai (>= 1.1.1), MultiAssayExperiment, R6, - renv (>= 1.0.7), + renv (>= 1.0.10.9000), rmarkdown (>= 2.23), rvest (>= 1.0.0), shinytest2, From bdd6be9748ea24c518a8cb4e952077aff31f9116 Mon Sep 17 00:00:00 2001 From: m7pr Date: Wed, 9 Oct 2024 12:39:55 +0200 Subject: [PATCH 2/2] change lookup refs to Remotes for dev version of renv --- .github/workflows/check.yaml | 4 ---- .github/workflows/docs.yaml | 1 - .github/workflows/release.yaml | 4 ---- .github/workflows/scheduled.yaml | 2 -- DESCRIPTION | 1 + 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 3a0c350517..03297d30fc 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -50,7 +50,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv r-cmd-non-cran: name: R CMD Check (non-CRAN) 🧬 uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main @@ -80,7 +79,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv coverage: name: Coverage πŸ“” uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main @@ -97,7 +95,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv linter: if: github.event_name != 'push' name: SuperLinter πŸ¦Έβ€β™€οΈ @@ -117,7 +114,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv gitleaks: name: gitleaks πŸ’§ uses: insightsengineering/r.pkg.template/.github/workflows/gitleaks.yaml@main diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 845d1ca1de..7c3e2f9617 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -50,4 +50,3 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0bafc40357..1f5cb83933 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv validation: name: R Package Validation report πŸ“ƒ needs: release @@ -40,7 +39,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv release: name: Create release πŸŽ‰ uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main @@ -73,7 +71,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv coverage: name: Coverage πŸ“” needs: [release, docs] @@ -91,7 +88,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv wasm: name: Build WASM packages πŸ§‘β€πŸ­ needs: release diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 5988285e7c..104b05f4b0 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -64,7 +64,6 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv rhub: if: > github.event_name == 'schedule' || ( @@ -81,4 +80,3 @@ jobs: insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - rstudio/renv diff --git a/DESCRIPTION b/DESCRIPTION index 511df6f890..43bc5c007f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -81,6 +81,7 @@ Config/Needs/verdepcheck: rstudio/shiny, insightsengineering/teal.data, rstudio/rmarkdown, tidyverse/rvest, rstudio/shinytest2, rstudio/shinyvalidate, r-lib/testthat, r-lib/withr, yaml=vubiostat/r-yaml +Remotes: rstudio/renv Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US