Skip to content

Commit 8f7b03c

Browse files
Fix CI failures (#4147)
* Remove adding libgit2 PPA as r-lib/actions#97 gets merged * Skip geom_quantile() tests if quantreg is not available * Do not install gdal * Tweak * Install only binary packages and use Linux for R-devel
1 parent c131022 commit 8f7b03c

File tree

5 files changed

+8
-32
lines changed

5 files changed

+8
-32
lines changed

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
config:
2525
- {os: windows-latest, r: '4.0', vdiffr: true, xref: true}
2626
- {os: macOS-latest, r: '4.0', vdiffr: true, xref: true}
27-
- {os: macOS-latest, r: 'devel', vdiffr: false, xref: true}
27+
- {os: ubuntu-16.04, r: 'devel', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
2828
- {os: ubuntu-16.04, r: '4.0', vdiffr: true, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
2929
- {os: ubuntu-16.04, r: '3.6', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
3030
- {os: ubuntu-16.04, r: '3.5', vdiffr: false, xref: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
@@ -71,10 +71,6 @@ jobs:
7171
env:
7272
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
7373
run: |
74-
# Use cran:libgit2 PPA to avoid conflicts of libcurl4-gnutls-dev
75-
# Remove this after https://github.com/r-lib/actions/pull/97 gets merged
76-
sudo add-apt-repository ppa:cran/libgit2
77-
7874
Rscript -e "remotes::install_github('r-hub/sysreqs')"
7975
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
8076
sudo -s eval "$sysreqs"
@@ -85,17 +81,8 @@ jobs:
8581
# XQuartz is needed by vdiffr
8682
brew cask install xquartz
8783
88-
# To install vdiffr, these three libraries/tools are needed in addition to XQuartz
89-
# - freetype (already installed, needed by systemfonts)
90-
# - cairo (not installed, needed by gdtools)
91-
# - pkg-config (not installed, needed to set proper build settings)
92-
brew install pkg-config cairo
93-
94-
# Since sf dependencies are a bit heavy, install them only when they are needed
95-
SF_NEEDS_UPDATED=$(Rscript -e 'if (!"sf" %in% installed.packages()[,"Package"] || "sf" %in% old.packages()[,"Package"]) cat("yes")')
96-
if [ "${SF_NEEDS_UPDATED}" == "yes" ]; then
97-
brew install udunits gdal
98-
fi
84+
# Use only binary packages
85+
echo 'options(pkgType = "binary")' >> ~/.Rprofile
9986
10087
- name: Install dependencies
10188
run: |

.github/workflows/pkgdown.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install dependencies
1818
run: |
1919
install.packages("remotes")
20-
remotes::install_deps(dependencies = TRUE)
20+
remotes::install_deps(dependencies = TRUE, type = "binary")
2121
remotes::install_github("tidyverse/tidytemplate")
2222
remotes::install_dev("pkgdown")
2323
shell: Rscript {0}

.github/workflows/pr-commands.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
- uses: r-lib/actions/setup-r@master
1616
- name: Install dependencies
17-
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE)'
17+
run: Rscript -e 'install.packages(c("remotes", "roxygen2"))' -e 'remotes::install_deps(dependencies = TRUE, type = "binary"'
1818
- name: Document
1919
run: Rscript -e 'roxygen2::roxygenise()'
2020
- name: commit

.github/workflows/test-coverage.yaml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,14 @@ jobs:
3939
restore-keys: ${{ env.cache-version }}-macOS-r-${{ env.r-version }}-
4040

4141
- name: Install system dependencies on macOS
42-
if: runner.os == 'macOS'
4342
run: |
4443
# XQuartz is needed by vdiffr
4544
brew cask install xquartz
4645
47-
# To install vdiffr, these three libraries/tools are needed in addition to XQuartz
48-
# - freetype (already installed, needed by systemfonts)
49-
# - cairo (not installed, needed by gdtools)
50-
# - pkg-config (not installed, needed to set proper build settings)
51-
brew install pkg-config cairo
52-
53-
# Since sf dependencies are a bit heavy, install them only when they are needed
54-
SF_NEEDS_UPDATED=$(Rscript -e 'if (!"sf" %in% installed.packages()[,"Package"] || "sf" %in% old.packages()[,"Package"]) cat("yes")')
55-
if [ "${SF_NEEDS_UPDATED}" == "yes" ]; then
56-
brew install udunits gdal
57-
fi
58-
5946
- name: Install dependencies
6047
run: |
6148
install.packages(c("remotes"))
62-
remotes::install_deps(dependencies = TRUE)
49+
remotes::install_deps(dependencies = TRUE, type = "binary")
6350
remotes::install_cran("covr")
6451
shell: Rscript {0}
6552

tests/testthat/test-geom-quantile.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
context("geom-quantile")
22

33
test_that("geom_quantile matches quantile regression", {
4+
skip_if_not_installed("quantreg")
5+
46
set.seed(6531)
57
x <- rnorm(10)
68
df <- tibble::tibble(

0 commit comments

Comments
 (0)