Skip to content
Merged
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
19 changes: 3 additions & 16 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
config:
- {os: windows-latest, r: '4.0', vdiffr: true, xref: true}
- {os: macOS-latest, r: '4.0', vdiffr: true, xref: true}
- {os: macOS-latest, r: 'devel', vdiffr: false, xref: true}
- {os: ubuntu-16.04, r: 'devel', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
- {os: ubuntu-16.04, r: '4.0', vdiffr: true, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
- {os: ubuntu-16.04, r: '3.6', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
- {os: ubuntu-16.04, r: '3.5', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
Expand Down Expand Up @@ -71,10 +71,6 @@ jobs:
env:
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
run: |
# Use cran:libgit2 PPA to avoid conflicts of libcurl4-gnutls-dev
# Remove this after https://github.com/r-lib/actions/pull/97 gets merged
sudo add-apt-repository ppa:cran/libgit2

Rscript -e "remotes::install_github('r-hub/sysreqs')"
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
sudo -s eval "$sysreqs"
Expand All @@ -85,17 +81,8 @@ jobs:
# XQuartz is needed by vdiffr
brew cask install xquartz

# To install vdiffr, these three libraries/tools are needed in addition to XQuartz
# - freetype (already installed, needed by systemfonts)
# - cairo (not installed, needed by gdtools)
# - pkg-config (not installed, needed to set proper build settings)
brew install pkg-config cairo

# Since sf dependencies are a bit heavy, install them only when they are needed
SF_NEEDS_UPDATED=$(Rscript -e 'if (!"sf" %in% installed.packages()[,"Package"] || "sf" %in% old.packages()[,"Package"]) cat("yes")')
if [ "${SF_NEEDS_UPDATED}" == "yes" ]; then
brew install udunits gdal
fi
# Use only binary packages
echo 'options(pkgType = "binary")' >> ~/.Rprofile

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install dependencies
run: |
install.packages("remotes")
remotes::install_deps(dependencies = TRUE)
remotes::install_deps(dependencies = TRUE, type = "binary")
remotes::install_github("tidyverse/tidytemplate")
remotes::install_dev("pkgdown")
shell: Rscript {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-commands.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: r-lib/actions/setup-r@master
- name: Install dependencies
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE)'
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE, type = "binary"'
- name: Document
run: Rscript -e 'roxygen2::roxygenise()'
- name: commit
Expand Down
15 changes: 1 addition & 14 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,14 @@ jobs:
restore-keys: ${{ env.cache-version }}-macOS-r-${{ env.r-version }}-

- name: Install system dependencies on macOS
if: runner.os == 'macOS'
run: |
# XQuartz is needed by vdiffr
brew cask install xquartz

# To install vdiffr, these three libraries/tools are needed in addition to XQuartz
# - freetype (already installed, needed by systemfonts)
# - cairo (not installed, needed by gdtools)
# - pkg-config (not installed, needed to set proper build settings)
brew install pkg-config cairo

# Since sf dependencies are a bit heavy, install them only when they are needed
SF_NEEDS_UPDATED=$(Rscript -e 'if (!"sf" %in% installed.packages()[,"Package"] || "sf" %in% old.packages()[,"Package"]) cat("yes")')
if [ "${SF_NEEDS_UPDATED}" == "yes" ]; then
brew install udunits gdal
fi

- name: Install dependencies
run: |
install.packages(c("remotes"))
remotes::install_deps(dependencies = TRUE)
remotes::install_deps(dependencies = TRUE, type = "binary")
remotes::install_cran("covr")
shell: Rscript {0}

Expand Down
2 changes: 2 additions & 0 deletions tests/testthat/test-geom-quantile.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
context("geom-quantile")

test_that("geom_quantile matches quantile regression", {
skip_if_not_installed("quantreg")

set.seed(6531)
x <- rnorm(10)
df <- tibble::tibble(
Expand Down