From 950f71ff58f19ba256b4d9a90a082b0fe76375c0 Mon Sep 17 00:00:00 2001 From: Carson Date: Mon, 31 Jul 2023 17:38:00 -0500 Subject: [PATCH] First pass at migrating to connect.posit.it --- .github/workflows/apps-deploy.yml | 22 +++++++++++----------- R/deploy-connect-urls.R | 6 +++--- README.Rmd | 4 ++-- README.md | 4 ++-- inst/apps/000-all/app.R | 2 +- inst/apps/000-manual/app.R | 2 +- inst/gha/data-connect-urls-update.R | 2 +- man/connect.Rd | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/apps-deploy.yml b/.github/workflows/apps-deploy.yml index 89361ca0b0..3834505bbe 100644 --- a/.github/workflows/apps-deploy.yml +++ b/.github/workflows/apps-deploy.yml @@ -39,16 +39,16 @@ jobs: # extra_app_text: ", apps = list('000-all', '000-manual', 1, 2)" ## Deployment server has been disabled - # - os: "${{ needs.config.outputs.ubuntu }}" - # r: "4.1" - # type: "connect" - # account: "barret" - # server_name: "beta.rstudioconnect.com" - # server_url: "https://beta.rstudioconnect.com/__api__" - # rspm: "https://demo.rstudiopm.com/all/__linux__/focal/latest" - # cores: 1 - # retry: 3 - # extra_app_text: ", apps = list('000-all', '000-manual', 1, 2)" + - os: "${{ needs.config.outputs.ubuntu }}" + r: "${{ needs.config.outputs.oldrel1 }}" + type: "connect" + account: "carson" + server_name: "connect.posit.it" + server_url: "https://connect.posit.it/__api__" + rspm: "https://demo.rstudiopm.com/all/__linux__/focal/latest" + cores: 1 + retry: 3 + extra_app_text: ", apps = list('000-all', '000-manual', 1, 2)" env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true @@ -117,7 +117,7 @@ jobs: rsconnect::connectApiUser( '${{ matrix.config.account }}', '${{ matrix.config.server_name }}', - apiKey = '${{ secrets.BARRET_BETA_RSTUDIOCONNECT_COM_API_KEY }}' + apiKey = '${{ secrets.CARSON_CONNECT_POSIT_IT_API_KEY }}' ) # Deploy diff --git a/R/deploy-connect-urls.R b/R/deploy-connect-urls.R index c6e8e7d175..b326cf14e4 100644 --- a/R/deploy-connect-urls.R +++ b/R/deploy-connect-urls.R @@ -1,4 +1,4 @@ -# testShinyExamples::set_public("barret", "beta.rstudioconnect.com", "APIKEY") +# shinycoreci::connect_set_public("barret", "connect.posit.it", "APIKEY") #' Make Connect Shiny applications publically available @@ -19,7 +19,7 @@ connect_set_public <- function( apps = apps_shiny, account = "barret", - server = "beta.rstudioconnect.com" + server = "connect.posit.it" ) { apps <- vapply(apps, resolve_app_name, character(1)) @@ -73,7 +73,7 @@ connect_set_public <- function( connect_urls <- function( apps = apps_deploy, account = "barret", - server = "beta.rstudioconnect.com" + server = "connect.posit.it" ) { # apps_dirs <- file.path(dir, apps) apps <- vapply(apps, resolve_app_name, character(1)) diff --git a/README.Rmd b/README.Rmd index 0ad655d0fa..83ad44a6dc 100644 --- a/README.Rmd +++ b/README.Rmd @@ -74,7 +74,7 @@ Commands used to test in different situations: * R Terminal / R GUI - `shinycoreci::test_in_browser()` * (Any) Web Browser - `shinycoreci::test_in_browser()` * [shinyapps.io](http://shinyapps.io) - `shinycoreci::test_in_shinyappsio()` -* [RStudio Connect](http://beta.rstudioconnect.com) - `shinycoreci::test_in_connect()` +* [RStudio Connect](http://connect.posit.it) - `shinycoreci::test_in_connect()` * SSO - `shinycoreci::test_in_sso(release = "focal")` > Requires `Docker` application to be running * SSP - `shinycoreci::test_in_ssp(release = "centos7")` @@ -153,7 +153,7 @@ This repo contains several [GitHub Actions](https://github.com/features/actions) * [**Test apps:**](https://github.com/rstudio/shinycoreci/actions/workflows/apps-test-matrix.yml) Run all automated tests (via `shiny::runTests()`). If on `main` branch, test results will be saved to `_test_results` branch. * [**Docker:**](https://github.com/rstudio/shinycoreci/actions/workflows/apps-docker.yml) Create all SSO and SSP docker images. Docker images are hosted on [`rstudio/shinycoreci` via GitHub Packages](https://github.com/rstudio/shinycoreci/pkgs/container/shinycoreci). -* [**Deploy**](https://github.com/rstudio/shinycoreci/actions/workflows/apps-deploy.yml): Deploy all testing apps to [shinyapps.io](shinyapps.io) and [beta.rstudioconnect.com](https://beta.rstudioconnect.com) +* [**Deploy**](https://github.com/rstudio/shinycoreci/actions/workflows/apps-deploy.yml): Deploy all testing apps to [shinyapps.io](shinyapps.io) and [connect.posit.it](https://connect.posit.it) * [**Build results website**](https://github.com/rstudio/shinycoreci/actions/workflows/build-results.yml): Builds results for **Test apps** workflow. This workflow is called from within **Test apps**. After all tests have completed, this workflow will process all results in `_test_results` branch into static files, storing the results in `gh-pages` branch. Final website location of results: https://rstudio.github.io/shinycoreci/results/ * [**Package checks**](https://github.com/rstudio/shinycoreci/actions/workflows/R-CMD-check.yaml): There are three main tasks that this workflow achieves: 1. Creates the `website` via `{pkgdown}` diff --git a/README.md b/README.md index 2cb36c37fc..e077c9af74 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Commands used to test in different situations: - R Terminal / R GUI - `shinycoreci::test_in_browser()` - (Any) Web Browser - `shinycoreci::test_in_browser()` - [shinyapps.io](http://shinyapps.io) - `shinycoreci::test_in_shinyappsio()` - - [RStudio Connect](http://beta.rstudioconnect.com) - `shinycoreci::test_in_connect()` + - [RStudio Connect](http://connect.posit.it) - `shinycoreci::test_in_connect()` - SSO - `shinycoreci::test_in_sso(release = "focal")` \> Requires `Docker` application to be running - SSP - `shinycoreci::test_in_ssp(release = "centos7")` @@ -152,7 +152,7 @@ This repo contains several [GitHub Actions](https://github.com/features/actions) - [**Test apps:**](https://github.com/rstudio/shinycoreci/actions/workflows/apps-test-matrix.yml) Run all automated tests (via `shiny::runTests()`). If on `main` branch, test results will be saved to `_test_results` branch. - [**Docker:**](https://github.com/rstudio/shinycoreci/actions/workflows/apps-docker.yml) Create all SSO and SSP docker images. Docker images are hosted on [`rstudio/shinycoreci` via GitHub Packages](https://github.com/rstudio/shinycoreci/pkgs/container/shinycoreci). - - [**Deploy**](https://github.com/rstudio/shinycoreci/actions/workflows/apps-deploy.yml): Deploy all testing apps to [shinyapps.io](shinyapps.io) and [beta.rstudioconnect.com](https://beta.rstudioconnect.com) + - [**Deploy**](https://github.com/rstudio/shinycoreci/actions/workflows/apps-deploy.yml): Deploy all testing apps to [shinyapps.io](shinyapps.io) and [connect.posit.it](https://connect.posit.it) - [**Build results website**](https://github.com/rstudio/shinycoreci/actions/workflows/build-results.yml): Builds results for **Test apps** workflow. This workflow is called from within **Test apps**. After all tests have completed, this workflow will process all results in `_test_results` branch into static files, storing the results in `gh-pages` branch. Final website location of results: - [**Package checks**](https://github.com/rstudio/shinycoreci/actions/workflows/R-CMD-check.yaml): There are three main tasks that this workflow achieves: 1. Creates the `website` via `{pkgdown}` diff --git a/inst/apps/000-all/app.R b/inst/apps/000-all/app.R index 654a57c627..72c457bb43 100644 --- a/inst/apps/000-all/app.R +++ b/inst/apps/000-all/app.R @@ -12,7 +12,7 @@ # shinyApp(ui, server) # This app is very similar to 000-manual, any changes here should be made there -if (grepl("beta.rstudioconnect.com", Sys.getenv("CONNECT_SERVER", "not-found"), fixed = TRUE)) { +if (grepl("connect.posit.it", Sys.getenv("CONNECT_SERVER", "not-found"), fixed = TRUE)) { message("On Connect!") shinycoreci:::test_in_connect_app(app_name = "001-hello", apps = shinycoreci:::apps_deploy) } else if (grepl("shinyapps", Sys.getenv("R_CONFIG_ACTIVE", "not-found"))) { diff --git a/inst/apps/000-manual/app.R b/inst/apps/000-manual/app.R index 396d5b65be..97bacfe328 100644 --- a/inst/apps/000-manual/app.R +++ b/inst/apps/000-manual/app.R @@ -1,5 +1,5 @@ # This app is very similar to 001-all, any changes here should be made there -if (grepl("beta.rstudioconnect.com", Sys.getenv("CONNECT_SERVER", "not-found"), fixed = TRUE)) { +if (grepl("connect.posit.it", Sys.getenv("CONNECT_SERVER", "not-found"), fixed = TRUE)) { message("On Connect!") shinycoreci:::test_in_connect_app(app_name = "001-hello", apps = shinycoreci:::apps_manual) } else if (grepl("shinyapps", Sys.getenv("R_CONFIG_ACTIVE", "not-found"))) { diff --git a/inst/gha/data-connect-urls-update.R b/inst/gha/data-connect-urls-update.R index f9842ecfe0..bc6b7fabe1 100644 --- a/inst/gha/data-connect-urls-update.R +++ b/inst/gha/data-connect-urls-update.R @@ -1,7 +1,7 @@ update_connect_urls <- function( apps = shinycoreci:::apps_deploy, account = "barret", - server = "beta.rstudioconnect.com", + server = "connect.posit.it", repo_dir = "." ) { diff --git a/man/connect.Rd b/man/connect.Rd index 96fab327d9..a87941ba5b 100644 --- a/man/connect.Rd +++ b/man/connect.Rd @@ -8,13 +8,13 @@ connect_set_public( apps = apps_shiny, account = "barret", - server = "beta.rstudioconnect.com" + server = "connect.posit.it" ) connect_urls( apps = apps_deploy, account = "barret", - server = "beta.rstudioconnect.com" + server = "connect.posit.it" ) } \arguments{