Skip to content

Commit

Permalink
Don't statically copy shiny::renderUI() at build time (#370)
Browse files Browse the repository at this point in the history
* Close #369: don't statically copy shiny::renderUI() at build time

* bye travis; hello gha

* bump version; update news

* change versioning
  • Loading branch information
cpsievert authored Sep 29, 2021
1 parent dc1e15b commit 9664f0b
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 62 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
^tests-manual$
^\.travis\.yml$
^appveyor\.yml$
^\.github$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
70 changes: 70 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
#
# NOTE: This workflow is overkill for most R packages and
# check-standard.yaml is likely a better choice.
# usethis::use_github_action("check-standard") will install it.
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}

- {os: windows-latest, r: 'release'}
# Use 3.6 to trigger usage of RTools35
- {os: windows-latest, r: '3.6'}

# Use older ubuntu to maximise backward compatibility
- {os: ubuntu-18.04, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-18.04, r: 'release'}
- {os: ubuntu-18.04, r: 'oldrel-1'}
- {os: ubuntu-18.04, r: 'oldrel-2'}
- {os: ubuntu-18.04, r: 'oldrel-3'}
- {os: ubuntu-18.04, r: 'oldrel-4'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-pandoc@v1

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
with:
extra-packages: rcmdcheck

- uses: r-lib/actions/check-r-package@v1

- name: Show testthat output
if: always()
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: shinydashboard
Title: Create Dashboards with 'Shiny'
Version: 0.7.1
Version: 0.7.2
Authors@R: c(
person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
person("Barbara", "Borges Ribeiro", role = "aut", email = "barbara@rstudio.com"),
Expand Down
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
shinydashboard 0.7.2
====================

### Bug fixes

* Fixed [#369](https://github.com/rstudio/shinydashboard/issues/369): `renderMenu()` now works correctly with shiny 1.7.0 (and higher). ([#370](https://github.com/rstudio/shinydashboard/pull/370))

shinydashboard 0.7.1
====================

Expand Down
8 changes: 7 additions & 1 deletion R/menuOutput.R
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,13 @@ menuItemOutput <- function(outputId) {
#'
#' shinyApp(ui, server)
#' }
renderMenu <- shiny::renderUI
renderMenu <- function(expr, env = parent.frame(), quoted = FALSE, outputArgs = list()) {
if (!quoted) {
expr <- substitute(expr)
quoted <- TRUE
}
shiny::renderUI(expr, env = env, quoted = quoted, outputArgs = outputArgs)
}

# R CMD check thinks that shiny::renderUI has an undeclared global variable
# called "func".
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Shiny Dashboard
===============

*Travis:* [![Travis-CI Build Status](https://travis-ci.org/rstudio/shinydashboard.svg?branch=master)](https://travis-ci.org/rstudio/shinydashboard)

*AppVeyor:* [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/rstudio/shinydashboard?branch=master&svg=true)](https://ci.appveyor.com/project/rstudio/shinydashboard)
<!-- badges: start -->
[![R-CMD-check](https://github.com/rstudio/shinydashboard/workflows/R-CMD-check/badge.svg)](https://github.com/rstudio/shinydashboard/actions)
<!-- badges: end -->

## Installation

Expand Down
45 changes: 0 additions & 45 deletions appveyor.yml

This file was deleted.

0 comments on commit 9664f0b

Please sign in to comment.