Apply suggestions from code review

Co-authored-by: Carson Sievert <cpsievert1@gmail.com>
rstudio · May 17, 2024 · f32501a · f32501a
1 parent 68d6f4c
commit f32501a
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 56 deletions.
diff --git a/.github/workflows/apps-config.yml b/.github/workflows/apps-config.yml
@@ -16,15 +16,6 @@ on:
       ubuntu:
         description: ubuntu OS value
         value: "ubuntu-20.04"
-      ubuntu-packagemanager-cran-url:
-        description: ubuntu packagemanager url to be used for CRAN installations
-        value: "https://packagemanager.posit.co/cran/__linux__/focal/latest"
-      packagemanager-cran-url:
-        description: packagemanager url to be used for CRAN installations
-        value: "https://packagemanager.posit.co/cran/latest"
-      shinyverse-cran-url:
-        description: CRAN url to be used for shinyverse installations via r-universe
-        value: "https://posit-dev-shinycoreci.r-universe.dev"
       cache-version:
         description: cache-version to be used when pulling library cache
         value: "5"

diff --git a/.github/workflows/apps-deploy.yml b/.github/workflows/apps-deploy.yml
@@ -37,7 +37,6 @@ jobs:
             cores: 5
             retry: 3
             # extra_app_text: ", apps = c('000-all', '000-manual', '300-bs-themer')"
-            packagemanager-cran-url: ${{ needs.config.outputs.ubuntu-packagemanager-cran-url }}
 
           - os: "${{ needs.config.outputs.ubuntu }}"
             r: "${{ needs.config.outputs.oldrel1 }}"
@@ -48,7 +47,6 @@ jobs:
             cores: 1
             retry: 3
             # extra_app_text: ", apps = c('000-all', '000-manual', '300-bs-themer')"
-            packagemanager-cran-url: ${{ needs.config.outputs.ubuntu-packagemanager-cran-url }}
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -70,9 +68,6 @@ jobs:
         with:
           r-version: ${{ matrix.config.r }}
           cache-version: deploy-2-${{ needs.config.outputs.cache-version }}
-          # extra-packages: rstudio/rsconnect
-          packagemanager-cran-url: ${{ matrix.config.packagemanager-cran-url}}
-          shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
 
       # Perform as second step to make sure this version is installed
       - name: Install shinycoreci from GitHub

diff --git a/.github/workflows/apps-test-matrix.yml b/.github/workflows/apps-test-matrix.yml
@@ -31,44 +31,34 @@ jobs:
       r-version: ${{ needs.config.outputs.release }}
       os: ${{ needs.config.outputs.macos }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   macos-oldrel-1:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel1 }}
       os: ${{ needs.config.outputs.macos }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   macos-oldrel-2:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel2 }}
       os: ${{ needs.config.outputs.macos }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   macos-oldrel-3:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel3 }}
       os: ${{ needs.config.outputs.macos }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   macos-oldrel-4:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel4 }}
       os: ${{ needs.config.outputs.macos }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
 
   ubuntu-release:
     needs: [config]
@@ -77,17 +67,13 @@ jobs:
       r-version: ${{ needs.config.outputs.release }}
       os: ${{ needs.config.outputs.ubuntu }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.ubuntu-packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   ubuntu-oldrel-1:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel1 }}
       os: ${{ needs.config.outputs.ubuntu }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.ubuntu-packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   ubuntu-oldrel-2:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
@@ -104,17 +90,13 @@ jobs:
       r-version: ${{ needs.config.outputs.oldrel3 }}
       os: ${{ needs.config.outputs.ubuntu }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.ubuntu-packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   ubuntu-oldrel-4:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel4 }}
       os: ${{ needs.config.outputs.ubuntu }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.ubuntu-packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
 
   windows-release:
     needs: [config]
@@ -123,44 +105,34 @@ jobs:
       r-version: ${{ needs.config.outputs.release }}
       os: ${{ needs.config.outputs.windows }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   windows-oldrel-1:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel1 }}
       os: ${{ needs.config.outputs.windows }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   windows-oldrel-2:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel2 }}
       os: ${{ needs.config.outputs.windows }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   windows-oldrel-3:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel3 }}
       os: ${{ needs.config.outputs.windows }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
   windows-oldrel-4:
     needs: [config]
     uses: ./.github/workflows/apps-test-os.yml
     with:
       r-version: ${{ needs.config.outputs.oldrel4 }}
       os: ${{ needs.config.outputs.windows }}
       cache-version: ${{ needs.config.outputs.cache-version }}
-      packagemanager-cran-url: ${{ needs.config.outputs.packagemanager-cran-url }}
-      shinyverse-cran-url: ${{ needs.config.outputs.shinyverse-cran-url }}
 
   build-results:
     uses: ./.github/workflows/build-results.yml

diff --git a/.github/workflows/apps-test-os.yml b/.github/workflows/apps-test-os.yml
@@ -29,11 +29,6 @@ on:
         type: string
         default: "3.x"
         required: false
-      packagemanager-cran-url:
-        type: string
-        description: packagemanager url to be used for CRAN installations
-        default: "https://packagemanager.posit.co/cran/latest"
-        required: false
       # rtools-35:
       #   type: boolean
       #   default: true
@@ -135,7 +130,6 @@ jobs:
           http-user-agent: ${{ inputs.http-user-agent }}
           pandoc-version: ${{ inputs.pandoc-version }}
           extra-packages: ${{ inputs.extra-packages }}
-          packagemanager-cran-url: ${{ inputs.packagemanager-cran-url }}
 
       # Install packages as necessary!
       - name: Run tests

diff --git a/R/deploy-apps.R b/R/deploy-apps.R
@@ -18,7 +18,7 @@ deploy_apps <- function(
     account = "testing-apps",
     server = "shinyapps.io",
     ...,
-    local_pkgs = TRUE,
+    local_pkgs = FALSE,
     extra_packages = NULL,
     cores = 1,
     retry = 2,

diff --git a/R/install-path.R b/R/install-path.R
@@ -7,12 +7,6 @@ on_ci <- function() {
 #' @keywords internal
 resolve_libpath <- function(..., local_pkgs = FALSE) {
   stopifnot(length(list(...)) == 0)
-  # # CI cache location; Use standard libpath on CI to avoid installing the shinyverse twice
-  # if (on_ci()) {
-  #   # Use standard libpath location
-  #   return(.libPaths()[1])
-  # }
-
   # If using local_pkgs, use the standard libpath location
   libpath <- if (isTRUE(local_pkgs)) .libPaths()[1] else shinycoreci_libpath()
   libpath

diff --git a/README.Rmd b/README.Rmd
@@ -71,7 +71,7 @@ cat(
 
 #### R-Universe
 
-`{shinycoreci}` testing leverages rOpenScie [`r-universe`](https://r-universe.dev/search/), specifically the [`posit-dev-shinycoreci`](https://posit-dev-shinycoreci.r-universe.dev/builds) universe. This universe is used to install the latest development versions of the Shiny related packages (updated hourly) used in the testing apps without the need for a GitHub token. This last detail is important, as it allows GitHub Actions to install packages freely without the worry of being rate limited. This gives us the ability to attempt to install each app's dependencies independently, leading to higher test coverage as a single dependencies does not block the entire test execution.
+`{shinycoreci}` testing leverages rOpenSci [`r-universe`](https://r-universe.dev/search/), specifically the [`posit-dev-shinycoreci`](https://posit-dev-shinycoreci.r-universe.dev/builds) universe. This universe is used to install the latest development versions of the Shiny related packages (updated hourly) used in the testing apps without the need for a GitHub token. This last detail is important, as it allows GitHub Actions to install packages freely without the worry of being rate limited. This gives us the ability to attempt to install each app's dependencies independently, leading to higher test coverage as a single dependencies does not block the entire test execution.
 
 
 

diff --git a/inst/apps/000-pkg-versions/app.R b/inst/apps/000-pkg-versions/app.R
@@ -77,6 +77,8 @@ server <- function(input, output, session) {
 
   # ----------------------------
 
+  # Packages inside `dt` are in the shinyverse so if there remote location is 
+  # not the universe url, then they're not properly installed.
   bad_dt <- dt %>% filter(!is.na(remoteRepos)) %>% filter(remoteRepos != universe_url)
 
   output$pkg_from_universe <- renderUI({