Skip to content

Commit 7ccaacc

Browse files
authored
Use shiny-workflows (#379)
1 parent 4ac9972 commit 7ccaacc

28 files changed

+245
-164
lines changed

.github/workflows/R-CMD-check.yaml

+14-62
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,22 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
2-
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
1+
# Workflow derived from https://github.com/rstudio/shiny-workflows
32
#
4-
# NOTE: This workflow is overkill for most R packages and
5-
# check-standard.yaml is likely a better choice.
6-
# usethis::use_github_action("check-standard") will install it.
3+
# NOTE: This Shiny team GHA workflow is overkill for most R packages.
4+
# For most R packages it is better to use https://github.com/r-lib/actions
75
on:
86
push:
9-
branches: [main, master]
7+
branches: [main, rc-**]
108
pull_request:
11-
branches: [main, master]
9+
branches: [main]
10+
schedule:
11+
- cron: '0 5 * * 1' # every monday
1212

13-
name: R-CMD-check
13+
name: Package checks
1414

1515
jobs:
16+
## Website must be updated manually
17+
# website:
18+
# uses: rstudio/shiny-workflows/.github/workflows/website.yaml@v1
19+
routine:
20+
uses: rstudio/shiny-workflows/.github/workflows/routine.yaml@v1
1621
R-CMD-check:
17-
runs-on: ${{ matrix.config.os }}
18-
19-
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
20-
21-
strategy:
22-
fail-fast: false
23-
matrix:
24-
config:
25-
- {os: macOS-latest, r: 'release'}
26-
27-
- {os: windows-latest, r: 'release'}
28-
# Use 3.6 to trigger usage of RTools35
29-
- {os: windows-latest, r: '3.6'}
30-
31-
# Use older ubuntu to maximise backward compatibility
32-
- {os: ubuntu-18.04, r: 'devel', http-user-agent: 'release'}
33-
- {os: ubuntu-18.04, r: 'release'}
34-
- {os: ubuntu-18.04, r: 'oldrel-1'}
35-
- {os: ubuntu-18.04, r: 'oldrel-2'}
36-
- {os: ubuntu-18.04, r: 'oldrel-3'}
37-
- {os: ubuntu-18.04, r: 'oldrel-4'}
38-
39-
env:
40-
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
41-
R_KEEP_PKG_SOURCE: yes
42-
43-
steps:
44-
- uses: actions/checkout@v2
45-
46-
- uses: r-lib/actions/setup-pandoc@v1
47-
48-
- uses: r-lib/actions/setup-r@v1
49-
with:
50-
r-version: ${{ matrix.config.r }}
51-
http-user-agent: ${{ matrix.config.http-user-agent }}
52-
use-public-rspm: true
53-
54-
- uses: r-lib/actions/setup-r-dependencies@v1
55-
with:
56-
extra-packages: rcmdcheck
57-
58-
- uses: r-lib/actions/check-r-package@v1
59-
60-
- name: Show testthat output
61-
if: always()
62-
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
63-
shell: bash
64-
65-
- name: Upload check results
66-
if: failure()
67-
uses: actions/upload-artifact@main
68-
with:
69-
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
70-
path: check
22+
uses: rstudio/shiny-workflows/.github/workflows/R-CMD-check.yaml@v1

DESCRIPTION

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ Imports:
2020
htmltools (>= 0.2.6),
2121
promises
2222
BugReports: https://github.com/rstudio/shinydashboard
23-
RoxygenNote: 6.0.1.9000
23+
RoxygenNote: 7.1.2
24+
Encoding: UTF-8

R/menuOutput.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ renderMenu <- function(expr, env = parent.frame(), quoted = FALSE, outputArgs =
151151

152152
# R CMD check thinks that shiny::renderUI has an undeclared global variable
153153
# called "func".
154-
globalVariables("func")
154+
utils::globalVariables("func")
155155

156156
#' Create a dropdown menu output (server side; deprecated)
157157
#'

R/shinydashboard-package.r

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#' shinydashboard
2-
#'
3-
#' @name shinydashboard
41
#' @import htmltools
5-
#' @docType package
6-
NULL
2+
#' @keywords internal
3+
"_PACKAGE"

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Shiny Dashboard
22
===============
33

44
<!-- badges: start -->
5-
[![R-CMD-check](https://github.com/rstudio/shinydashboard/workflows/R-CMD-check/badge.svg)](https://github.com/rstudio/shinydashboard/actions)
5+
[![R-CMD-check](https://github.com/rstudio/shinydashboard/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rstudio/shinydashboard/actions)
66
<!-- badges: end -->
77

88
## Installation

man/box.Rd

+16-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/dashboardHeader.Rd

+7-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/dashboardPage.Rd

+7-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/dropdownMenu.Rd

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/dropdownMenuOutput.Rd

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/infoBox.Rd

+14-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/menuItemOutput.Rd

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/menuOutput.Rd

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/messageItem.Rd

+10-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/notificationItem.Rd

+9-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/renderDropdownMenu.Rd

+9-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/renderMenu.Rd

+16-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)