Skip to content

Commit 34c7dcf

Browse files
committed
Upgrade gh actions
1 parent a7844b8 commit 34c7dcf

5 files changed

Lines changed: 48 additions & 48 deletions

File tree

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

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3-
#
4-
# NOTE: This workflow is overkill for most R packages and
5-
# check-standard.yaml is likely a better choice.
6-
# usethis::use_github_action("check-standard") will install it.
73
on:
84
push:
9-
branches: [main, master, release, mmap]
5+
branches: [main, master]
106
pull_request:
117
branches: [main, master]
128

@@ -22,47 +18,32 @@ jobs:
2218
fail-fast: false
2319
matrix:
2420
config:
25-
- {os: macOS-latest, r: 'release'}
21+
- {os: macos-latest, r: 'release'}
2622
- {os: windows-latest, r: 'release'}
27-
# - {os: windows-latest, r: '3.6'}
28-
- {os: ubuntu-18.04, r: 'devel', http-user-agent: 'release'}
29-
- {os: ubuntu-18.04, r: 'release'}
23+
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
24+
- {os: ubuntu-latest, r: 'release'}
25+
- {os: ubuntu-latest, r: 'oldrel-1'}
3026

3127
env:
3228
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3329
R_KEEP_PKG_SOURCE: yes
3430

3531
steps:
36-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v3
3733

38-
- uses: r-lib/actions/setup-pandoc@v1
34+
- uses: r-lib/actions/setup-pandoc@v2
3935

40-
- uses: r-lib/actions/setup-r@v1
36+
- uses: r-lib/actions/setup-r@v2
4137
with:
4238
r-version: ${{ matrix.config.r }}
4339
http-user-agent: ${{ matrix.config.http-user-agent }}
4440
use-public-rspm: true
4541

46-
- uses: r-lib/actions/setup-r-dependencies@v1
42+
- uses: r-lib/actions/setup-r-dependencies@v2
4743
with:
48-
extra-packages: rcmdcheck
49-
50-
- name: Check
51-
env:
52-
_R_CHECK_CRAN_INCOMING_: false
53-
run: |
54-
options(crayon.enabled = TRUE)
55-
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
56-
shell: Rscript {0}
57-
58-
- name: Show testthat output
59-
if: always()
60-
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
61-
shell: bash
44+
extra-packages: any::rcmdcheck
45+
needs: check
6246

63-
- name: Upload check results
64-
if: failure()
65-
uses: actions/upload-artifact@main
47+
- uses: r-lib/actions/check-r-package@v2
6648
with:
67-
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
68-
path: check
49+
upload-snapshots: true

.github/workflows/pkgdown.yaml

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,48 @@
1-
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
22
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
33
on:
44
push:
55
branches: [main, master]
6-
tags: ['*']
6+
pull_request:
7+
branches: [main, master]
8+
release:
9+
types: [published]
10+
workflow_dispatch:
711

812
name: pkgdown
913

1014
jobs:
1115
pkgdown:
1216
runs-on: ubuntu-latest
17+
# Only restrict concurrency for non-PR jobs
18+
concurrency:
19+
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
1320
env:
1421
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
22+
permissions:
23+
contents: write
1524
steps:
16-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
1726

18-
- uses: r-lib/actions/setup-pandoc@v1
27+
- uses: r-lib/actions/setup-pandoc@v2
1928

20-
- uses: r-lib/actions/setup-r@v1
29+
- uses: r-lib/actions/setup-r@v2
2130
with:
2231
use-public-rspm: true
2332

24-
- uses: r-lib/actions/setup-r-dependencies@v1
33+
- uses: r-lib/actions/setup-r-dependencies@v2
2534
with:
26-
extra-packages: pkgdown
35+
extra-packages: any::pkgdown, local::.
2736
needs: website
2837

29-
- name: Deploy package
30-
run: |
31-
git config --local user.name "$GITHUB_ACTOR"
32-
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
33-
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
38+
- name: Build site
39+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
40+
shell: Rscript {0}
41+
42+
- name: Deploy to GitHub pages 🚀
43+
if: github.event_name != 'pull_request'
44+
uses: JamesIves/github-pages-deploy-action@v4.4.1
45+
with:
46+
clean: false
47+
branch: gh-pages
48+
folder: docs

DESCRIPTION

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Version: 0.1.5.9002
55
Language: en-US
66
Encoding: UTF-8
77
License: LGPL-3
8-
URL: https://dipterix.org/filearray/, https://github.com/dipterix/filearray
8+
URL: https://dipterix.org/filearray/,
9+
https://github.com/dipterix/filearray
910
BugReports: https://github.com/dipterix/filearray/issues
1011
Authors@R: c(
1112
person(

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
<!-- badges: start -->
7-
[![R-check](https://github.com/dipterix/filearray/workflows/R-CMD-check/badge.svg)](https://github.com/dipterix/filearray/actions)
7+
[![R-CMD-check](https://github.com/dipterix/filearray/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/dipterix/filearray/actions/workflows/R-CMD-check.yaml)
88
[![CRAN status](https://www.r-pkg.org/badges/version/filearray)](https://CRAN.R-project.org/package=filearray)
99
[![Develop](https://dipterix.r-universe.dev/badges/filearray)](https://dipterix.r-universe.dev/ui#builds)
1010
<!-- badges: end -->

_pkgdown.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
url: http://dipterix.org/filearray
1+
url: https://dipterix.org/filearray/
2+
template:
3+
bootstrap: 5
4+

0 commit comments

Comments
 (0)