Skip to content

Commit 6b53983

Browse files
authored
GHA update (#533)
* udpate GHA * add a few more website req pkgs * use pak to install system dependencies
1 parent 2c97f59 commit 6b53983

File tree

4 files changed

+28
-13
lines changed

4 files changed

+28
-13
lines changed

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ jobs:
2828
config:
2929
- {os: macOS-latest, r: 'release'}
3030
- {os: windows-latest, r: 'release'}
31-
- {os: windows-latest, r: '3.6'}
32-
- {os: ubuntu-18.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.0.0 (ubuntu-18.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
31+
- {os: windows-latest, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/latest"}
32+
- {os: ubuntu-18.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.1.0 (ubuntu-18.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
3333
- {os: ubuntu-18.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
34+
- {os: ubuntu-18.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
35+
- {os: ubuntu-18.04, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
3436

3537
env:
3638
RSPM: ${{ matrix.config.rspm }}
@@ -56,7 +58,9 @@ jobs:
5658
- name: Restore R package cache
5759
uses: actions/cache@v2
5860
with:
59-
path: ${{ env.R_LIBS_USER }}
61+
path: |
62+
${{ env.R_LIBS_USER }}/*
63+
!${{ env.R_LIBS_USER }}/pak
6064
key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
6165
restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-
6266

@@ -116,3 +120,8 @@ jobs:
116120
with:
117121
name: ${{ matrix.config.os }}-r${{ matrix.config.r }}-results
118122
path: check
123+
124+
- name: Don't use tar from old Rtools to store the cache
125+
if: ${{ runner.os == 'Windows' && startsWith(steps.install-r.outputs.installed-r-version, '3.6' ) }}
126+
shell: bash
127+
run: echo "C:/Program Files/Git/usr/bin" >> $GITHUB_PATH

.github/workflows/pkgdown.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
branches:
44
- main
55
- master
6+
tags:
7+
-'*'
68

79
name: pkgdown
810

@@ -21,9 +23,6 @@ jobs:
2123

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

24-
- name: System dependencies
25-
run: brew install harfbuzz fribidi
26-
2726
- name: Install pak and query dependencies
2827
run: |
2928
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
@@ -33,7 +32,9 @@ jobs:
3332
- name: Restore R package cache
3433
uses: actions/cache@v2
3534
with:
36-
path: ${{ env.R_LIBS_USER }}
35+
path: |
36+
${{ env.R_LIBS_USER }}/*
37+
!${{ env.R_LIBS_USER }}/pak
3738
key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
3839
restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-
3940

@@ -42,17 +43,17 @@ jobs:
4243
run: |
4344
pak::local_system_requirements(execute = TRUE)
4445
pak::pkg_system_requirements("pkgdown", execute = TRUE)
46+
pak::pkg_system_requirements("textshaping", execute = TRUE)
47+
pak::pkg_system_requirements("gert", execute = TRUE)
4548
shell: Rscript {0}
4649

4750
- name: Install dependencies
4851
run: |
49-
pak::local_install_dev_deps(upgrade = TRUE)
52+
pak::local_install_dev_deps(upgrade = TRUE, dependencies = c("all", "Config/Needs/website"))
5053
pak::pkg_install("pkgdown")
51-
pak::pkg_install("tidyverse/tidytemplate")
52-
pak::pkg_install("tidymodels")
53-
pak::pkg_install("C50")
5454
shell: Rscript {0}
5555

56+
5657
- name: Install Miniconda
5758
run: |
5859
Rscript -e "pak::pkg_install('rstudio/reticulate')"

.github/workflows/test-coverage.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ jobs:
3232
- name: Restore R package cache
3333
uses: actions/cache@v2
3434
with:
35-
path: ${{ env.R_LIBS_USER }}
35+
path: |
36+
${{ env.R_LIBS_USER }}/*
37+
!${{ env.R_LIBS_USER }}/pak
3638
key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
3739
restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-
3840

@@ -41,6 +43,8 @@ jobs:
4143
run: |
4244
pak::local_system_requirements(execute = TRUE)
4345
pak::pkg_system_requirements("covr", execute = TRUE)
46+
pak::pkg_system_requirements("textshaping", execute = TRUE)
47+
pak::pkg_system_requirements("gert", execute = TRUE)
4448
shell: Rscript {0}
4549

4650
- name: Install dependencies

DESCRIPTION

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ Remotes:
7171
tidymodels/dials
7272
ByteCompile: true
7373
Config/Needs/website:C50, earth, glmnet, keras, kernlab, kknn, LiblineaR,
74-
mgcv, nnet, parsnip, randomForest, ranger, rpart, rstanarm, xgboost
74+
mgcv, nnet, parsnip, randomForest, ranger, rpart, rstanarm, tidymodels,
75+
tidyverse/tidytemplate, xgboost
7576
Encoding: UTF-8
7677
LazyData: true
7778
Roxygen: list(markdown = TRUE)

0 commit comments

Comments
 (0)