From 20c53b2b20908251900a119c4bdc983050531ef4 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Mon, 11 Mar 2024 12:01:21 +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 c97833307..ba9ede6ac 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -87,3 +87,5 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/style.yaml@main with: auto-update: true + secrets: + REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml new file mode 100644 index 000000000..b674b0b45 --- /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 0fa4a06c8..226473ce9 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 72d0960d8e619f1cab9cdd6c968b1a5af1cf65a4 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 11:42:13 +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 92834f6ee..7883c9c40 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -42,3 +42,5 @@ SECURITY.md coverage.* data-raw/data.R ^pkgdown$ +^revdeprefs\.yaml$ +^revdep$ diff --git a/.github/workflows/on-demand.yaml b/.github/workflows/on-demand.yaml new file mode 100644 index 000000000..02843bb32 --- /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 0ce1948f2c8aeeed435fe20ffc1f53e74fd35fe0 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 14:17:15 +0200 Subject: [PATCH 3/8] Add .covrignore to .Rbuildignore --- .Rbuildignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.Rbuildignore b/.Rbuildignore index 7883c9c40..e7864fb0c 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -44,3 +44,4 @@ data-raw/data.R ^pkgdown$ ^revdeprefs\.yaml$ ^revdep$ +^\.covrignore$ From 9fd79cdb4fbe00b7d589df9db2661db37b347d82 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 14:32:42 +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 34cf777cd..bd9142a18 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,6 +42,7 @@ repos: .*\.xml| .*/cdisc_datasets\.y[a]?ml| (.*/|)\_pkgdown.y[a]?ml| + (.*/|)\.covrignore| (.*/|)\.gitignore| (.*/|)\.gitlab-ci\.y[a]?ml| (.*/|)\.lintr| From d09b2d5b43416be88b586c3646b76d6b27be6f4b Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 15:01:16 +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 255bf2677..874a56417 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ vignettes/*.html vignettes/*.md /doc/ /Meta/ +tests/testthat/_snaps/**/*.new.md +tests/testthat/_snaps/**/*.new.svg From 44c19855356244f9f3fa88fac080169fc79f1158 Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 15:26:40 +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 000000000..111ab324f --- /dev/null +++ b/revdep/.gitignore @@ -0,0 +1,7 @@ +checks +library +checks.noindex +library.noindex +cloud.noindex +data.sqlite +*.html From 3526813bc5a1bf175fb65307b187ff356ebf92ed Mon Sep 17 00:00:00 2001 From: Franciszek Walkowiak Date: Fri, 26 Apr 2024 15:34:21 +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 e7864fb0c..74606c60b 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -42,6 +42,6 @@ SECURITY.md coverage.* data-raw/data.R ^pkgdown$ -^revdeprefs\.yaml$ +^.revdeprefs\.yaml$ ^revdep$ ^\.covrignore$ From 1fb733ce24e9b522dfb280f671473d0f759c9a25 Mon Sep 17 00:00:00 2001 From: cicdguy <26552821+cicdguy@users.noreply.github.com> Date: Mon, 29 Apr 2024 08:29:31 -0500 Subject: [PATCH 8/8] Add snapshot testing job Signed-off-by: cicdguy <26552821+cicdguy@users.noreply.github.com> --- .github/workflows/check.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index ba9ede6ac..d8112aa2c 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -41,6 +41,27 @@ 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: + 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