From 37afdfebadfb6ac057fe73635bbe48f86226e2bf Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Mon, 11 Mar 2024 12:00:55 +0100 Subject: [PATCH 1/8] [skip ci] Workflow propagation --- .github/workflows/check.yaml | 2 ++ .github/workflows/cla.yaml | 18 ++++++++++++++++++ .github/workflows/release.yaml | 13 ++----------- 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/cla.yaml diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index f5ff446a..b07fb1a2 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -87,6 +87,8 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/style.yaml@main with: auto-update: true + secrets: + REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} grammar: if: github.event_name != 'push' name: Grammar Check 🔤 diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml new file mode 100644 index 00000000..b674b0b4 --- /dev/null +++ b/.github/workflows/cla.yaml @@ -0,0 +1,18 @@ +name: CLA 🔏 + +on: + issue_comment: + types: + - created + # For PRs that originate from forks + pull_request_target: + types: + - opened + - closed + - synchronize + +jobs: + CLA: + name: CLA 📝 + uses: insightsengineering/.github/.github/workflows/cla.yaml@main + secrets: inherit diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0fa4a06c..226473ce 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,15 +8,6 @@ on: workflow_dispatch: jobs: - build: - name: Build package 🎁 - needs: release - uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main - secrets: - REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} - with: - skip-r-cmd-check: true - skip-r-cmd-install: true docs: name: Pkgdown Docs 📚 needs: release @@ -36,8 +27,8 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} - r-cmd: - name: R CMD Check đŸ§Ŧ + build: + name: Build package and reports 🎁 needs: [release, docs] uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main secrets: From bca284781a3f70758dfb0b05a76d77fb39ef0add Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 11:41:34 +0200 Subject: [PATCH 2/8] Add revdepcheck configuration --- .Rbuildignore | 2 ++ .github/workflows/on-demand.yaml | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 .github/workflows/on-demand.yaml diff --git a/.Rbuildignore b/.Rbuildignore index e4a572d6..a6abc13c 100755 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -44,3 +44,5 @@ coverage.* ^renv\.lock$ SECURITY.md ^pkgdown$ +^revdeprefs\.yaml$ +^revdep$ diff --git a/.github/workflows/on-demand.yaml b/.github/workflows/on-demand.yaml new file mode 100644 index 00000000..02843bb3 --- /dev/null +++ b/.github/workflows/on-demand.yaml @@ -0,0 +1,12 @@ +--- +name: On-demand 🧑‍đŸ”Ŧ + +on: + schedule: + - cron: '45 3 * * 0' + workflow_dispatch: + +jobs: + revdepcheck: + name: revdepcheck ↩ī¸ + uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main From 617640bbeb73c1815a369108cc23eec752e92099 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 14:16:33 +0200 Subject: [PATCH 3/8] Add .covrignore to .Rbuildignore --- .Rbuildignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.Rbuildignore b/.Rbuildignore index a6abc13c..ae78cfa9 100755 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -46,3 +46,4 @@ SECURITY.md ^pkgdown$ ^revdeprefs\.yaml$ ^revdep$ +^\.covrignore$ From 4a8933c9b66ebfafd3c8e8e753d93fd1e356ea0a Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 14:32:03 +0200 Subject: [PATCH 4/8] Add .covrignore to .pre-commit-config.yaml --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 785b87a0..12aecc22 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,6 +48,7 @@ repos: .*\.svg| .*\.xml| (.*/|)\_pkgdown.y[a]?ml| + (.*/|)\.covrignore| (.*/|)\.gitignore| (.*/|)\.gitlab-ci\.y[a]?ml| (.*/|)\.lintr| From 5cae9c37a513af02089cd83f03e5ee0f62d48ba0 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 15:00:37 +0200 Subject: [PATCH 5/8] Add new testthat snapshots to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b2a7690e..362c1756 100755 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ tmp.* vignettes/*.R vignettes/*.html vignettes/*.md +tests/testthat/_snaps/**/*.new.md +tests/testthat/_snaps/**/*.new.svg From 085cab134209fbe07c7774ce94bf73174b27e7a5 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 15:26:00 +0200 Subject: [PATCH 6/8] [skip ci] Add revdep directory --- revdep/.gitignore | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 revdep/.gitignore diff --git a/revdep/.gitignore b/revdep/.gitignore new file mode 100644 index 00000000..111ab324 --- /dev/null +++ b/revdep/.gitignore @@ -0,0 +1,7 @@ +checks +library +checks.noindex +library.noindex +cloud.noindex +data.sqlite +*.html From 60c19b679cea71b82f9daf06bf5962449e6615f5 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 15:33:31 +0200 Subject: [PATCH 7/8] [skip ci] Fix typo --- .Rbuildignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Rbuildignore b/.Rbuildignore index ae78cfa9..e33e9b87 100755 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -44,6 +44,6 @@ coverage.* ^renv\.lock$ SECURITY.md ^pkgdown$ -^revdeprefs\.yaml$ +^.revdeprefs\.yaml$ ^revdep$ ^\.covrignore$ From e888a15568da19a168ddd7b668d2f986bb06e98b Mon Sep 17 00:00:00 2001 From: cicdguy <26552821+cicdguy@users.noreply.github.com> Date: Mon, 29 Apr 2024 08:46:04 -0500 Subject: [PATCH 8/8] Add snapshot testing job Signed-off-by: cicdguy <26552821+cicdguy@users.noreply.github.com> --- .github/workflows/check.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index b07fb1a2..b84e2738 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -41,6 +41,29 @@ jobs: checking top-level files .* NOTE unit-test-report-brand: >- https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/teal.png + r-cmd-non-cran: + name: R CMD Check (non-CRAN) đŸ§Ŧ + uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main + secrets: + REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} + with: + additional-env-vars: | + _R_CHECK_EXAMPLE_TIMING_THRESHOLD_=10 + enforce-note-blocklist: true + publish-unit-test-report-gh-pages: false + junit-xml-comparison: false + concurrency-group: non-cran + disable-unit-test-reports: true + skip-r-cmd-install: true + note-blocklist: | + checking dependencies in R code .* NOTE + checking R code for possible problems .* NOTE + checking examples .* NOTE + checking Rd line widths .* NOTE + checking S3 generic/method consistency .* NOTE + checking Rd .usage sections .* NOTE + checking for unstated dependencies in vignettes .* NOTE + checking top-level files .* NOTE coverage: name: Coverage 📔 uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main