Merge branch 'main' into enhancements

insightsengineering · Sep 23, 2024 · 7abd3db · 7abd3db
2 parents f1cc09d + 4c631d5
commit 7abd3db
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 14 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -43,6 +43,9 @@ jobs:
     uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main
     secrets:
       REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
+    with:
+      additional-env-vars: |
+        NOT_CRAN=true
   linter:
     if: github.event_name != 'push'
     name: SuperLinter 🦸‍♀️

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -40,5 +40,5 @@ jobs:
     secrets:
       REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
     with:
-      default-landing-page: main
+      default-landing-page: latest-tag
       additional-unit-test-report-directories: unit-test-report-non-cran
diff --git 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,6 +27,25 @@ jobs:
     uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main
     secrets:
       REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
+  build:
+    name: Build package and reports 🎁
+    needs: [release, docs]
+    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_CRAN_INCOMING_REMOTE_=false
+      additional-r-cmd-check-params: --as-cran
+  coverage:
+    name: Coverage 📔
+    needs: [release, docs]
+    uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main
+    secrets:
+      REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
+    with:
+      additional-env-vars: |
+        NOT_CRAN=true
   wasm:
     name: Build WASM packages 🧑‍🏭
     needs: release

diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml
@@ -1,13 +1,30 @@
 ---
-name: On-demand 🧑‍🔬
+name: Scheduled 🕰️
 
 on:
   schedule:
     - cron: '45 3 * * 0'
   workflow_dispatch:
+    inputs:
+      chosen-workflow:
+        description: |
+          Select which workflow you'd like to run
+        required: true
+        type: choice
+        default: rhub
+        options:
+          - rhub
+          - dependency-test
+          - branch-cleanup
+          - revdepcheck
 
 jobs:
   dependency-test:
+    if: >
+      github.event_name == 'schedule' || (
+        github.event_name == 'workflow_dispatch' &&
+        inputs.chosen-workflow == 'dependency-test'
+      )
     strategy:
       fail-fast: false
       matrix:
@@ -22,13 +39,28 @@ jobs:
       additional-env-vars: |
         PKG_SYSREQS_DRY_RUN=true
   branch-cleanup:
+    if: >
+      github.event_name == 'schedule' || (
+        github.event_name == 'workflow_dispatch' &&
+        inputs.chosen-workflow == 'branch-cleanup'
+      )
     name: Branch Cleanup 🧹
     uses: insightsengineering/r.pkg.template/.github/workflows/branch-cleanup.yaml@main
     secrets:
       REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
   revdepcheck:
+    if: >
+      github.event_name == 'schedule' || (
+        github.event_name == 'workflow_dispatch' &&
+        inputs.chosen-workflow == 'revdepcheck'
+      )
     name: revdepcheck ↩️
     uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main
   rhub:
+    if: >
+      github.event_name == 'schedule' || (
+        github.event_name == 'workflow_dispatch' &&
+        inputs.chosen-workflow == 'rhub'
+      )
     name: R-hub 🌐
     uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: roxy.shinylive
 Title: A Roxygen2 Extension for Shinylive
-Version: 0.0.0.9002
+Version: 0.0.0.9003
 Authors@R: c(
     person("Pawel Rucki", , , "[email protected]", role = c("aut", "cre")),
     person("F. Hoffmann-La Roche AG", role = c("cph", "fnd"))
@@ -23,7 +23,7 @@ Suggests:
     pkgdown (>= 1.2.0),
     testthat (>= 3.0.4),
     withr (>= 2.4.3)
-Config/Needs/verdepcheck:tidyverse/glue, jeroen/jsonlite,
+Config/Needs/verdepcheck: tidyverse/glue, jeroen/jsonlite,
     lzstring=parmsam/lzstring-r, r-lib/roxygen2, tidyverse/stringr,
     r-lib/pkgdown, r-lib/testthat, r-lib/withr
 Config/Needs/website: insightsengineering/nesttemplate

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,3 @@
-# roxy.shinylive 0.0.0.9002
+# roxy.shinylive 0.0.0.9003
 
 - Initialize the package.