Migrate from r4ds org to shinyworks. (#55)

* Migrate from r4ds org to shinyworks. * Update snaps. * Update workflows.
shinyworks · Nov 13, 2023 · d574752 · d574752
1 parent 0cf3aef
commit d574752
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 42 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,   r: 'release'}
+          - {os: macos-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
@@ -29,7 +29,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

diff --git a/.github/workflows/merge_shinyapps.yml b/.github/workflows/merge_shinyapps.yml
@@ -8,10 +8,10 @@ on:
 
 jobs:
   deploy-shinyapps:
-    if: github.repository_owner == 'r4ds'
+    if: github.repository_owner == 'shinyworks'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: '4.2.2'
@@ -22,5 +22,5 @@ jobs:
       - name: Push to shinyapps
         run: |
           rsconnect::setAccountInfo(name='r4dscommunity', token=${{secrets.SHINYAPPS_TOKEN}}, secret=${{secrets.SHINYAPPS_SECRET}})
-          rsconnect::deployApp(appName = 'scenes')
+          rsconnect::deployApp(appName = 'scenes', forceUpdate = TRUE)
         shell: Rscript {0}
diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -19,8 +19,10 @@ jobs:
       group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml
@@ -14,7 +14,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
@@ -51,7 +51,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:

diff --git a/.github/workflows/pr_shinyapps.yml b/.github/workflows/pr_shinyapps.yml
@@ -10,7 +10,7 @@ jobs:
   deploy-shinyapps:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: '4.2.2'
@@ -21,5 +21,5 @@ jobs:
       - name: Push to shinyapps
         run: |
           rsconnect::setAccountInfo(name='r4dscommunity', token=${{secrets.SHINYAPPS_TOKEN}}, secret=${{secrets.SHINYAPPS_SECRET}})
-          rsconnect::deployApp(appName = 'scenestest')
+          rsconnect::deployApp(appName = 'scenestest', forceUpdate = TRUE)
         shell: Rscript {0}
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -12,10 +12,10 @@ jobs:
   test-coverage:
     runs-on: ubuntu-latest
     env:
-      GITHUB_PAT: ${{ secrets.GH_PAT }}
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
@@ -27,5 +27,24 @@ jobs:
           needs: coverage
 
       - name: Test coverage
-        run: covr::codecov(quiet = FALSE)
+        run: |
+          covr::codecov(
+            quiet = FALSE,
+            clean = FALSE,
+            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+          )
         shell: Rscript {0}
+
+      - name: Show testthat output
+        if: always()
+        run: |
+          ## --------------------------------------------------------------------
+          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+        shell: bash
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage-test-failures
+          path: ${{ runner.temp }}/package
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,20 +1,17 @@
 Package: scenes
 Title: Switch Between Alternative 'shiny' UIs
 Version: 0.1.0.9000
-Authors@R: c(
-    person("Jon", "Harmon", , "[email protected]", role = c("aut", "cre", 
-           "cph"), comment = c(ORCID = "0000-0003-4781-4346"))
-    )
-Description: Sometimes it is useful to serve up alternative 'shiny' UIs 
-    depending on information passed in the request object, such as the value of 
-    a cookie or a query parameter. This packages facilitates such switches.
+Authors@R: 
+    person("Jon", "Harmon", , "[email protected]", role = c("aut", "cre", "cph"),
+           comment = c(ORCID = "0000-0003-4781-4346"))
+Description: Sometimes it is useful to serve up alternative 'shiny' UIs
+    depending on information passed in the request object, such as the
+    value of a cookie or a query parameter. This packages facilitates such
+    switches.
 License: MIT + file LICENSE
-Encoding: UTF-8
-Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
-URL: https://github.com/r4ds/scenes,
-    https://r4ds.github.io/scenes/
-BugReports: https://github.com/r4ds/scenes/issues
+URL: https://shinyworks.github.io/scenes/,
+    https://github.com/shinyworks/scenes
+BugReports: https://github.com/shinyworks/scenes/issues
 Imports: 
     cli,
     cookies,
@@ -29,5 +26,9 @@ Suggests:
     rmarkdown,
     stringr,
     testthat (>= 3.0.0)
+VignetteBuilder: 
+    knitr
 Config/testthat/edition: 3
-VignetteBuilder: knitr
+Encoding: UTF-8
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.2.3
diff --git a/README.Rmd b/README.Rmd
@@ -13,13 +13,13 @@ knitr::opts_chunk$set(
 )
 ```
 
-# scenes <a href="https://r4ds.github.io/scenes/"><img src="man/figures/logo.svg" align="right" height="424" /></a>
+# scenes <a href="https://shinyworks.github.io/scenes/"><img src="man/figures/logo.svg" align="right" height="424" /></a>
 
 <!-- badges: start -->
 [![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
 [![CRAN status](https://www.r-pkg.org/badges/version/scenes)](https://CRAN.R-project.org/package=scenes)
-[![Codecov test coverage](https://codecov.io/gh/r4ds/scenes/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r4ds/scenes?branch=main)
-[![R-CMD-check](https://github.com/r4ds/scenes/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r4ds/scenes/actions/workflows/R-CMD-check.yaml)
+[![Codecov test coverage](https://codecov.io/gh/shinyworks/scenes/branch/main/graph/badge.svg)](https://app.codecov.io/gh/shinyworks/scenes?branch=main)
+[![R-CMD-check](https://github.com/shinyworks/scenes/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/shinyworks/scenes/actions/workflows/R-CMD-check.yaml)
 <!-- badges: end -->
 
 The goal of {scenes} is to make it easy to switch a {shiny} app between alternative 
@@ -38,12 +38,12 @@ Or install the development version of scenes from [GitHub](https://github.com/)
 
 ``` r
 # install.packages("remotes")
-remotes::install_github("r4ds/scenes")
+remotes::install_github("shinyworks/scenes")
 ```
 
 ## Use Cases
 
-You can see a demonstration of {scenes} [here](https://r4dscommunity.shinyapps.io/scenes/).
+You can see a demonstration of {scenes} [here](https://shinyworkscommunity.shinyapps.io/scenes/).
 
 Some examples of how you might use {scenes} to switch between different UIs in a Shiny app:
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 <!-- README.md is generated from README.Rmd. Please edit that file -->
 
-# scenes <a href="https://r4ds.github.io/scenes/"><img src="man/figures/logo.svg" align="right" height="424" /></a>
+# scenes <a href="https://shinyworks.github.io/scenes/"><img src="man/figures/logo.svg" align="right" height="424" /></a>
 
 <!-- badges: start -->
 
@@ -10,8 +10,8 @@ experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](h
 [![CRAN
 status](https://www.r-pkg.org/badges/version/scenes)](https://CRAN.R-project.org/package=scenes)
 [![Codecov test
-coverage](https://codecov.io/gh/r4ds/scenes/branch/main/graph/badge.svg)](https://app.codecov.io/gh/r4ds/scenes?branch=main)
-[![R-CMD-check](https://github.com/r4ds/scenes/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r4ds/scenes/actions/workflows/R-CMD-check.yaml)
+coverage](https://codecov.io/gh/shinyworks/scenes/branch/main/graph/badge.svg)](https://app.codecov.io/gh/shinyworks/scenes?branch=main)
+[![R-CMD-check](https://github.com/shinyworks/scenes/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/shinyworks/scenes/actions/workflows/R-CMD-check.yaml)
 <!-- badges: end -->
 
 The goal of {scenes} is to make it easy to switch a {shiny} app between
@@ -31,13 +31,13 @@ Or install the development version of scenes from
 
 ``` r
 # install.packages("remotes")
-remotes::install_github("r4ds/scenes")
+remotes::install_github("shinyworks/scenes")
 ```
 
 ## Use Cases
 
 You can see a demonstration of {scenes}
-[here](https://r4dscommunity.shinyapps.io/scenes/).
+[here](https://shinyworkscommunity.shinyapps.io/scenes/).
 
 Some examples of how you might use {scenes} to switch between different
 UIs in a Shiny app:

diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -1,4 +1,4 @@
-url: https://r4ds.github.io/scenes/
+url: https://shinyworks.github.io/scenes/
 template:
   bootstrap: 5
 
diff --git a/man/scenes-package.Rd b/man/scenes-package.Rd
diff --git a/tests/testthat/_snaps/change.md b/tests/testthat/_snaps/change.md
@@ -2,7 +2,8 @@
 
     Code
       default_ui()
-    Warning <rlang_warning>
+    Condition
+      Warning:
       No ui specified for this request. Loading default ui.
     Output
       $status