Skip to content

Commit

Permalink
Merge branch 'main' into popovers
Browse files Browse the repository at this point in the history
  • Loading branch information
cpsievert committed Aug 7, 2023
2 parents 2c8c191 + 26d40b9 commit 43f8b63
Show file tree
Hide file tree
Showing 232 changed files with 749 additions and 730 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/apps-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@ 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: "barret"
server_name: "rsc.radixu.com"
server_url: "https://rsc.radixu.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)"

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
RSPM: ${{ matrix.config.rspm }}
# RSPM: ${{ matrix.config.rspm }}

steps:
- uses: actions/checkout@v3
Expand All @@ -70,7 +70,7 @@ jobs:
with:
r-version: ${{ matrix.config.r }}
cache-version: deploy-2-${{ needs.config.outputs.cache-version }}
extra-packages: any::rsconnect
extra-packages: rstudio/rsconnect

# Perform as second step to make sure this version is installed
- name: Install shinycoreci from GitHub
Expand Down Expand Up @@ -101,15 +101,15 @@ jobs:
shell: Rscript {0}
run: |
# Add server info
rsconnect::addConnectServer(
rsconnect::addServer(
url = '${{ matrix.config.server_url }}',
name = '${{ matrix.config.server_name }}'
)
# Add user info
rsconnect::connectApiUser(
'${{ matrix.config.account }}',
'${{ matrix.config.server_name }}',
apiKey = '${{ secrets.BARRET_BETA_RSTUDIOCONNECT_COM_API_KEY }}'
apiKey = '${{ secrets.BARRET_CONNECT_API_KEY }}'
)
# Deploy
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Suggests:
httpuv,
rappdirs,
rmarkdown (>= 2.9),
rsconnect (>= 0.8.16-9001),
rsconnect (>= 1.0.1),
testthat,
httr,
tibble,
Expand Down
340 changes: 175 additions & 165 deletions R/data-connect-urls.R

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion inst/apps/000-all/app.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
# 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(
attr(shinycoreci:::default_connect_urls, "server"),
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
9 changes: 7 additions & 2 deletions inst/apps/000-manual/app.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# 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)) {
# This app is very similar to 000-all, any changes here should be made there

if (grepl(
attr(shinycoreci:::default_connect_urls, "server"),
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
}
},
"rockvars": {
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"html": "<div class=\"form-group shiny-input-container\">\n <label class=\"control-label\" id=\"vars-label\" for=\"vars\">从岩石数据中选择一列作为自变量<\/label>\n <div>\n <select id=\"vars\" class=\"shiny-input-select\"><option value=\"周长\" selected>周长<\/option>\n<option value=\"形状\">形状<\/option>\n<option value=\"渗透性\">渗透性<\/option><\/select>\n <script type=\"application/json\" data-for=\"vars\" data-nonempty=\"\">{\"plugins\":[\"selectize-plugin-a11y\"]}<\/script>\n <\/div>\n<\/div>",
"deps": [
{
"name": "selectize",
Expand Down
Loading

0 comments on commit 43f8b63

Please sign in to comment.