Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deployments #206

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions .github/workflows/apps-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,16 @@ jobs:
retry: 3
# 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 All @@ -72,6 +71,14 @@ jobs:
cache-version: deploy-2-${{ needs.config.outputs.cache-version }}
extra-packages: any::rsconnect

# Temporarily downgrade rsconnect
# (rsconnect 1.0 introduced an issue with deploying from CI
# TODO: Once a proper fix is CRAN, we can remove this step)
- name: Downgrade rsconnect
shell: Rscript {0}
run: |
pak::pkg_install("[email protected]")

# Perform as second step to make sure this version is installed
- name: Install shinycoreci from GitHub
shell: Rscript {0}
Expand Down Expand Up @@ -109,7 +116,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
340 changes: 175 additions & 165 deletions R/data-connect-urls.R

Large diffs are not rendered by default.

8 changes: 4 additions & 4 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 All @@ -43,7 +43,7 @@ connect_set_public <- function(
paste0("/applications/", app$id),
list(
id = app$id,
access_type = "all"
access_type = "logged_in"
)
)
}
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
Loading
Loading