From 01c1b3c0d0e40442f5a1fedd7d545aefb0ca8733 Mon Sep 17 00:00:00 2001 From: vedhav Date: Tue, 10 Dec 2024 16:23:14 +0530 Subject: [PATCH 1/5] add setup-r-dependencies --- .github/workflows/check.yaml | 60 +++++++++++++++++++++++++++++++ .github/workflows/docs.yaml | 15 ++++++++ .github/workflows/release.yaml | 61 ++++++++++++++++++++++++++++++++ .github/workflows/scheduled.yaml | 27 ++++++++------ 4 files changed, 152 insertions(+), 11 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 3b9e8d6c..9538911d 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -41,6 +41,21 @@ jobs: checking top-level files .* NOTE unit-test-report-brand: >- https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal r-cmd-non-cran: name: R CMD Check (non-CRAN) 🧬 uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main @@ -62,6 +77,21 @@ jobs: checking Rd .usage sections .* NOTE checking for unstated dependencies in vignettes .* NOTE checking top-level files .* NOTE + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal coverage: name: Coverage πŸ“” uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main @@ -70,6 +100,21 @@ jobs: with: additional-env-vars: | NOT_CRAN=true + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal linter: if: github.event_name != 'push' name: SuperLinter πŸ¦Έβ€β™€οΈ @@ -81,6 +126,21 @@ jobs: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} with: auto-update: true + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal 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 57ae8004..da44b819 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -42,3 +42,18 @@ jobs: with: default-landing-page: latest-tag additional-unit-test-report-directories: unit-test-report-non-cran + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index aa3e7bb4..60c4746e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,12 +16,43 @@ jobs: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} with: default-landing-page: latest-tag + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal validation: name: R Package Validation report πŸ“ƒ needs: release uses: insightsengineering/r.pkg.template/.github/workflows/validation.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} + with: + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal release: name: Create release πŸŽ‰ uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main @@ -46,6 +77,21 @@ jobs: checking top-level files .* NOTE unit-test-report-brand: >- https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal coverage: name: Coverage πŸ“” needs: [release, docs] @@ -55,6 +101,21 @@ jobs: with: additional-env-vars: | NOT_CRAN=true + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/osprey + insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice + insightsengineering/teal.reporter + insightsengineering/teal.widgets + insightsengineering/teal.transform + insightsengineering/teal wasm: name: Build WASM packages πŸ§‘β€πŸ­ needs: release diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 8ef483a1..b7af6e2d 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -3,7 +3,7 @@ name: Scheduled πŸ•°οΈ on: schedule: - - cron: '45 3 * * 0' + - cron: "45 3 * * 0" workflow_dispatch: inputs: chosen-workflow: @@ -59,15 +59,18 @@ jobs: with: lookup-refs: | insightsengineering/osprey - insightsengineering/teal - insightsengineering/teal.transform insightsengineering/formatters - insightsengineering/teal.code + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern insightsengineering/teal.logger + insightsengineering/teal.code + insightsengineering/teal.data + insightsengineering/teal.slice insightsengineering/teal.reporter insightsengineering/teal.widgets - insightsengineering/tern - insightsengineering/teal.data + insightsengineering/teal.transform + insightsengineering/teal rhub: if: > github.event_name == 'schedule' || ( @@ -79,13 +82,15 @@ jobs: with: lookup-refs: | insightsengineering/osprey - insightsengineering/teal - insightsengineering/teal.transform insightsengineering/formatters + insightsengineering/rtables + insightsengineering/rtables.officer + insightsengineering/tern + insightsengineering/teal.logger insightsengineering/teal.code + insightsengineering/teal.data insightsengineering/teal.slice - insightsengineering/teal.logger insightsengineering/teal.reporter insightsengineering/teal.widgets - insightsengineering/tern - insightsengineering/teal.data + insightsengineering/teal.transform + insightsengineering/teal From 03551aa3ae911f1bb47fdf2f132fa43b1a4b53d7 Mon Sep 17 00:00:00 2001 From: vedhav Date: Tue, 10 Dec 2024 17:32:51 +0530 Subject: [PATCH 2/5] rip `staged_dependencies.yaml` --- staged_dependencies.yaml | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 staged_dependencies.yaml diff --git a/staged_dependencies.yaml b/staged_dependencies.yaml deleted file mode 100644 index d04bf594..00000000 --- a/staged_dependencies.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -current_repo: - repo: insightsengineering/teal.osprey - host: https://github.com -upstream_repos: - insightsengineering/osprey: - repo: insightsengineering/osprey - host: https://github.com - insightsengineering/tern: - repo: insightsengineering/tern - host: https://github.com - insightsengineering/teal.logger: - repo: insightsengineering/teal.logger - host: https://github.com - insightsengineering/teal.widgets: - repo: insightsengineering/teal.widgets - host: https://github.com - insightsengineering/teal.code: - repo: insightsengineering/teal.code - host: https://github.com - insightsengineering/teal.data: - repo: insightsengineering/teal.data - host: https://github.com - insightsengineering/teal.reporter: - repo: insightsengineering/teal.reporter - host: https://github.com - insightsengineering/teal.transform: - repo: insightsengineering/teal.transform - host: https://github.com - insightsengineering/teal: - repo: insightsengineering/teal - host: https://github.com - insightsengineering/formatters: - repo: insightsengineering/formatters - host: https://github.com -downstream_repos: From 9b11344327510ea23345f17fd8e713706d136f3c Mon Sep 17 00:00:00 2001 From: vedhav Date: Wed, 11 Dec 2024 18:38:20 +0530 Subject: [PATCH 3/5] revert sd --- staged_dependencies.yaml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 staged_dependencies.yaml diff --git a/staged_dependencies.yaml b/staged_dependencies.yaml new file mode 100644 index 00000000..d04bf594 --- /dev/null +++ b/staged_dependencies.yaml @@ -0,0 +1,36 @@ +--- +current_repo: + repo: insightsengineering/teal.osprey + host: https://github.com +upstream_repos: + insightsengineering/osprey: + repo: insightsengineering/osprey + host: https://github.com + insightsengineering/tern: + repo: insightsengineering/tern + host: https://github.com + insightsengineering/teal.logger: + repo: insightsengineering/teal.logger + host: https://github.com + insightsengineering/teal.widgets: + repo: insightsengineering/teal.widgets + host: https://github.com + insightsengineering/teal.code: + repo: insightsengineering/teal.code + host: https://github.com + insightsengineering/teal.data: + repo: insightsengineering/teal.data + host: https://github.com + insightsengineering/teal.reporter: + repo: insightsengineering/teal.reporter + host: https://github.com + insightsengineering/teal.transform: + repo: insightsengineering/teal.transform + host: https://github.com + insightsengineering/teal: + repo: insightsengineering/teal + host: https://github.com + insightsengineering/formatters: + repo: insightsengineering/formatters + host: https://github.com +downstream_repos: From 843fac6ca87ec8747fe3f869cf93fa4aa7e5a861 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:13:17 +0000 Subject: [PATCH 4/5] [skip roxygen] [skip vbump] Roxygen Man Pages Auto Update --- man/tm_g_butterfly.Rd | 4 ++-- man/tm_g_patient_profile.Rd | 4 ++-- man/tm_g_spiderplot.Rd | 4 ++-- man/tm_g_swimlane.Rd | 4 ++-- man/tm_g_waterfall.Rd | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/man/tm_g_butterfly.Rd b/man/tm_g_butterfly.Rd index de60e798..7bd6ffa7 100644 --- a/man/tm_g_butterfly.Rd +++ b/man/tm_g_butterfly.Rd @@ -59,10 +59,10 @@ vector to indicate default value, minimum and maximum values.} \item{plot_width}{(\code{numeric(3)})\cr vector to indicate default value, minimum and maximum values.} -\item{pre_output}{(\code{shiny.tag}) optional,\cr +\item{pre_output}{(\code{shiny.tag}, optional)\cr with text placed before the output to put the output into context. For example a title.} -\item{post_output}{(\code{shiny.tag}) optional, with text placed after the output to put the output +\item{post_output}{(\code{shiny.tag}, optional) with text placed after the output to put the output into context. For example the \code{\link[shiny:helpText]{shiny::helpText()}} elements are useful.} } \value{ diff --git a/man/tm_g_patient_profile.Rd b/man/tm_g_patient_profile.Rd index d47fbd37..4a7f0a1a 100644 --- a/man/tm_g_patient_profile.Rd +++ b/man/tm_g_patient_profile.Rd @@ -82,10 +82,10 @@ vector to indicate default value, minimum and maximum values.} \item{plot_width}{(\code{numeric(3)})\cr vector to indicate default value, minimum and maximum values.} -\item{pre_output}{(\code{shiny.tag}) optional,\cr +\item{pre_output}{(\code{shiny.tag}, optional)\cr with text placed before the output to put the output into context. For example a title.} -\item{post_output}{(\code{shiny.tag}) optional, with text placed after the output to put the output +\item{post_output}{(\code{shiny.tag}, optional) with text placed after the output to put the output into context. For example the \code{\link[shiny:helpText]{shiny::helpText()}} elements are useful.} } \value{ diff --git a/man/tm_g_spiderplot.Rd b/man/tm_g_spiderplot.Rd index 9e2e51a1..f263257a 100644 --- a/man/tm_g_spiderplot.Rd +++ b/man/tm_g_spiderplot.Rd @@ -62,10 +62,10 @@ vector to indicate default value, minimum and maximum values.} \item{plot_width}{(\code{numeric(3)})\cr vector to indicate default value, minimum and maximum values.} -\item{pre_output}{(\code{shiny.tag}) optional,\cr +\item{pre_output}{(\code{shiny.tag}, optional)\cr with text placed before the output to put the output into context. For example a title.} -\item{post_output}{(\code{shiny.tag}) optional, with text placed after the output to put the output +\item{post_output}{(\code{shiny.tag}, optional) with text placed after the output to put the output into context. For example the \code{\link[shiny:helpText]{shiny::helpText()}} elements are useful.} } \value{ diff --git a/man/tm_g_swimlane.Rd b/man/tm_g_swimlane.Rd index 8a672d16..2a966510 100644 --- a/man/tm_g_swimlane.Rd +++ b/man/tm_g_swimlane.Rd @@ -64,10 +64,10 @@ vector to indicate default value, minimum and maximum values.} \item{plot_width}{(\code{numeric(3)})\cr vector to indicate default value, minimum and maximum values.} -\item{pre_output}{(\code{shiny.tag}) optional,\cr +\item{pre_output}{(\code{shiny.tag}, optional)\cr with text placed before the output to put the output into context. For example a title.} -\item{post_output}{(\code{shiny.tag}) optional, with text placed after the output to put the output +\item{post_output}{(\code{shiny.tag}, optional) with text placed after the output to put the output into context. For example the \code{\link[shiny:helpText]{shiny::helpText()}} elements are useful.} \item{x_label}{the label of the x axis} diff --git a/man/tm_g_waterfall.Rd b/man/tm_g_waterfall.Rd index 41a18191..97cc517d 100644 --- a/man/tm_g_waterfall.Rd +++ b/man/tm_g_waterfall.Rd @@ -85,10 +85,10 @@ vector to indicate default value, minimum and maximum values.} \item{plot_width}{(\code{numeric(3)})\cr vector to indicate default value, minimum and maximum values.} -\item{pre_output}{(\code{shiny.tag}) optional,\cr +\item{pre_output}{(\code{shiny.tag}, optional)\cr with text placed before the output to put the output into context. For example a title.} -\item{post_output}{(\code{shiny.tag}) optional, with text placed after the output to put the output +\item{post_output}{(\code{shiny.tag}, optional) with text placed after the output to put the output into context. For example the \code{\link[shiny:helpText]{shiny::helpText()}} elements are useful.} } \value{ From 437f65978d183dbd807c564c0d00cf7a1327e9a1 Mon Sep 17 00:00:00 2001 From: vedhav Date: Wed, 11 Dec 2024 18:48:54 +0530 Subject: [PATCH 5/5] trigger ci