Skip to content

Commit

Permalink
First pass at migrating to connect.posit.it
Browse files Browse the repository at this point in the history
  • Loading branch information
cpsievert committed Jul 31, 2023
1 parent 42602f8 commit 950f71f
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/apps-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions R/deploy-connect-urls.R
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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))

Expand Down Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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")`
Expand Down Expand Up @@ -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}`
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")`
Expand Down Expand Up @@ -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: <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}`
Expand Down
2 changes: 1 addition & 1 deletion inst/apps/000-all/app.R
Original file line number Diff line number Diff line change
Expand Up @@ -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"))) {
Expand Down
2 changes: 1 addition & 1 deletion inst/apps/000-manual/app.R
Original file line number Diff line number Diff line change
@@ -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"))) {
Expand Down
2 changes: 1 addition & 1 deletion inst/gha/data-connect-urls-update.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
update_connect_urls <- function(
apps = shinycoreci:::apps_deploy,
account = "barret",
server = "beta.rstudioconnect.com",
server = "connect.posit.it",
repo_dir = "."
) {

Expand Down
4 changes: 2 additions & 2 deletions man/connect.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 950f71f

Please sign in to comment.