From 80ee1cb45d019b92ed58c156b037b9d2b9317ddb Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Mon, 1 Nov 2021 10:09:04 -0400 Subject: [PATCH] master -> main (#112) --- .Rbuildignore | 2 + .github/workflows/R-CMD-check.yaml | 110 +++-------------------------- _pkgdown.yml | 5 ++ package.json | 5 +- tools/updateIonRangeSlider.R | 2 +- 5 files changed, 22 insertions(+), 102 deletions(-) create mode 100644 _pkgdown.yml diff --git a/.Rbuildignore b/.Rbuildignore index f8252b5..1a63786 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -20,3 +20,5 @@ ^.nvmrc$ ^\.github$ ^tools$ +^_pkgdown\.yml$ +^pkgdown$ diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 76268f8..f55dcdf 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,106 +1,18 @@ -# NOTE: This workflow is overkill for most R packages -# check-standard.yaml is likely a better choice -# usethis::use_github_action("check-standard") will install it. -# -# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. -# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions on: push: - branches: - - main - - master + branches: [main, rc-**] pull_request: - branches: - - main - - master + branches: [main] + schedule: + - cron: '0 9 * * 1' # every monday -name: R-CMD-check +name: Package checks jobs: + ## Needs custom setup. See ./docs/build-site.sh + # website: + # uses: rstudio/shinycoreci/.github/workflows/call-website.yaml@v1 + routine: + uses: rstudio/shinycoreci/.github/workflows/call-routine.yaml@v1 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'} - - {os: windows-latest, r: '3.6'} - - {os: ubuntu-16.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest", http-user-agent: "R/4.0.0 (ubuntu-16.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" } - - {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} - - {os: ubuntu-16.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} - - {os: ubuntu-16.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} - - {os: ubuntu-16.04, r: '3.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} - - {os: ubuntu-16.04, r: '3.3', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} - - env: - R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - RSPM: ${{ matrix.config.rspm }} - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - - steps: - - uses: actions/checkout@v2 - - - uses: r-lib/actions/setup-r@v1 - with: - r-version: ${{ matrix.config.r }} - http-user-agent: ${{ matrix.config.http-user-agent }} - - - uses: r-lib/actions/setup-pandoc@v1 - - - name: Query dependencies - run: | - install.packages('remotes') - saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) - writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") - shell: Rscript {0} - - - name: Cache R packages - if: runner.os != 'Windows' - uses: actions/cache@v2 - with: - path: ${{ env.R_LIBS_USER }} - key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} - restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- - - - name: Install system dependencies - if: runner.os == 'Linux' - run: | - while read -r cmd - do - eval sudo $cmd - done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "16.04"))') - - - name: Install dependencies - run: | - remotes::install_deps(dependencies = TRUE) - remotes::install_cran("rcmdcheck") - shell: Rscript {0} - - - name: Session info - run: | - options(width = 100) - pkgs <- installed.packages()[, "Package"] - sessioninfo::session_info(pkgs, include_base = TRUE) - shell: Rscript {0} - - - name: Check - env: - _R_CHECK_CRAN_INCOMING_: false - run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") - shell: Rscript {0} - - - 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 + uses: rstudio/shinycoreci/.github/workflows/call-R-CMD-check.yaml@v1 diff --git a/_pkgdown.yml b/_pkgdown.yml new file mode 100644 index 0000000..86bb657 --- /dev/null +++ b/_pkgdown.yml @@ -0,0 +1,5 @@ +url: http://rstudio.github.io/crosstalk + +# Do not display dev version by default +development: + mode: auto diff --git a/package.json b/package.json index 50a2e34..b1c679d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "crosstalk", - "version": "1.0.0", + "version": "1.1.1-alpha.9000", "description": "", "main": "inst/www/js/crosstalk.js", "directories": { @@ -40,5 +40,6 @@ }, "dependencies": { "babel-core": "^6.26.0" - } + }, + "files": [] } diff --git a/tools/updateIonRangeSlider.R b/tools/updateIonRangeSlider.R index 606173a..9c67ef1 100644 --- a/tools/updateIonRangeSlider.R +++ b/tools/updateIonRangeSlider.R @@ -2,7 +2,7 @@ lib_dir <- rprojroot::find_package_root_file("inst/lib") unlink(file.path(lib_dir, "ionrangeslider"), recursive = TRUE) # Version of shiny to use when copying over ionrangeslider assets -version <- "master" +version <- "main" withr::with_tempdir({ cmd <- paste("git clone --depth 1 --branch", version, "https://github.com/rstudio/shiny") system(cmd)