From e5901ce32639f9556eb2076117502ff6b5a06b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Wed, 12 Jul 2023 08:51:48 +0200 Subject: [PATCH 1/5] ci: adds temporary action on push --- .github/workflows/scheduled.yaml | 10 ++++++++-- DESCRIPTION | 17 +++++++++++------ NEWS.md | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 62afcda..577bca7 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -5,14 +5,20 @@ on: schedule: - cron: '45 3 * * 0' workflow_dispatch: + # Section to be removed before action is merged + # note: branch below needs to point to main instead of new-verdepcheck-strategy + push: + branches: + - verdepcheck_action + # end of section to be removed jobs: dependency-test: strategy: fail-fast: false matrix: - test-strategy: ["min", "release", "max"] - uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@main + test-strategy: ["min_cohort", "min_isolated", "release", "max"] + uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@new-verdepcheck-strategy # Change back to "@main" name: Dependency Test - ${{ matrix.test-strategy }} 🔢 secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index 5fcfd05..7ee2ba6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,18 +21,23 @@ BugReports: https://github.com/insightsengineering/nestcolor/issues Depends: R (>= 3.6) Imports: - checkmate, + checkmate (> 2.1.0), ggplot2 (>= 3.4.0), - lifecycle + lifecycle (>= 0.1.0) Suggests: - knitr, - rmarkdown, - testthat (>= 2.0) + knitr (>= 1.34), + rmarkdown (>= 1.11), + testthat (>= 3.0.4) VignetteBuilder: knitr RdMacros: lifecycle -biocViews: +Config/Needs/verdepcheck: + mllg/checkmate, + tidyverse/ggplot2, + r-lib/lifecycle, + yihui/knitr, + r-lib/testthat Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 Language: en-US diff --git a/NEWS.md b/NEWS.md index 6030e90..d9548a7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # nestcolor 0.1.2.9004 -* In development +* Specify minimal version of dependent packages. # nestcolor 0.1.2 From 3ce2e72c5ad3e0e8a69b8ef9962bc3d2caa13445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Mon, 4 Sep 2023 13:07:01 +0200 Subject: [PATCH 2/5] ci: revert action to main branch and remove rmarkdown --- .github/workflows/scheduled.yaml | 2 +- DESCRIPTION | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 577bca7..e696caa 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: test-strategy: ["min_cohort", "min_isolated", "release", "max"] - uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@new-verdepcheck-strategy # Change back to "@main" + uses: insightsengineering/r.pkg.template/.github/workflows/verdepcheck.yaml@main name: Dependency Test - ${{ matrix.test-strategy }} 🔢 secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index 7ee2ba6..1750269 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,8 +25,7 @@ Imports: ggplot2 (>= 3.4.0), lifecycle (>= 0.1.0) Suggests: - knitr (>= 1.34), - rmarkdown (>= 1.11), + knitr (>= 1.42), testthat (>= 3.0.4) VignetteBuilder: knitr From 57e6b28ae8752033257a096c89fc833c8f0d1551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Mon, 4 Sep 2023 16:41:32 +0200 Subject: [PATCH 3/5] ci: remove push on branch to prepare merge --- .github/workflows/scheduled.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index e696caa..df66705 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -5,12 +5,6 @@ on: schedule: - cron: '45 3 * * 0' workflow_dispatch: - # Section to be removed before action is merged - # note: branch below needs to point to main instead of new-verdepcheck-strategy - push: - branches: - - verdepcheck_action - # end of section to be removed jobs: dependency-test: From 7c557222a18e0d490c95545e84155517c84a85f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Mon, 4 Sep 2023 23:14:43 +0200 Subject: [PATCH 4/5] docs: needs rmarkdown for R CMD check --- DESCRIPTION | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index 1750269..92d80b6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -26,6 +26,7 @@ Imports: lifecycle (>= 0.1.0) Suggests: knitr (>= 1.42), + rmarkdown (>= 2.19), testthat (>= 3.0.4) VignetteBuilder: knitr @@ -36,6 +37,7 @@ Config/Needs/verdepcheck: tidyverse/ggplot2, r-lib/lifecycle, yihui/knitr, + rstudio/rmarkdown, r-lib/testthat Config/Needs/website: insightsengineering/nesttemplate Encoding: UTF-8 From a3122eb9c357407a89c18ca54e742e3a779176bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?= <211358+averissimo@users.noreply.github.com> Date: Tue, 5 Sep 2023 13:32:18 +0200 Subject: [PATCH 5/5] docs: typo on NEWS.md --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index d9548a7..d28c7e1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # nestcolor 0.1.2.9004 -* Specify minimal version of dependent packages. +* Specified minimal version of package dependencies. # nestcolor 0.1.2