Skip to content

Commit

Permalink
Merge pull request #23 from TanguyBarthelemy/master
Browse files Browse the repository at this point in the history
update gha and lint
  • Loading branch information
TanguyBarthelemy authored May 15, 2024
2 parents 2705fd8 + 47e79dd commit 6a82581
Show file tree
Hide file tree
Showing 80 changed files with 791 additions and 826 deletions.
32 changes: 23 additions & 9 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
^docs$
^_pkgdown\.yml$

^.*\.Rproj$
^\.Rproj\.user$

^\.git$
^\.github$

^README\.Rmd$
^README-.*\.png$
.travis.yml
^pkgdown$
^doc$

^Meta$
^NEWS.html$
^TO_DO$
^docs$
^doc$
^pkgdown$
^_pkgdown\.yml$

^\.lintr$

^appveyor\.yml$
.travis.yml

cran-comments.md

^\.DS_Store$

^revdep$
^reconf\.sh$

^LICENCE$
^LICENSE$
^.github$
.lintr
33 changes: 17 additions & 16 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,35 @@ jobs:
fail-fast: false
matrix:
os: [ 'ubuntu-latest', 'windows-latest', 'macOS-latest' ]
r: [ 'devel', 'release', 'oldrel-1', '4.2.3', '4.2.1', '4.1.1', '4.1.3', '4.0.5', '3.6.1' ]
java: [ '8', '13', '17', '19' ]
r: [ 'devel', 'release', 'oldrel' ]
# r: [ 'devel', 'release', 'oldrel', 'oldrel-1', '4.2.3', '4.2.1', '4.1.1', '4.1.3', '4.0.5', '3.6.1' ]
java: [ '11' ]
# java: [ '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19' ]
include:
- http-user-agent: 'release'
r: 'devel'
# config:
# - {os: macOS-latest, r: 'release'}
# - {os: windows-latest, r: 'release'}
# - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
# - {os: ubuntu-latest, r: 'release'}
# - {os: ubuntu-latest, r: 'oldrel-1'}
# - {os: ubuntu-latest, r: '3.6.1'}
# - {os: ubuntu-latest, r: '4.1.3'}
# - {os: ubuntu-latest, r: '4.1.1'}
# - {os: ubuntu-latest, r: '4.2.1'}
# - {os: windows-latest, r: 'release', java: 11}
# - {os: windows-latest, r: 'devel', java: 11}
# - {os: windows-latest, r: 'oldrel', java: 11}
# - {os: macOS-latest, r: 'release', java: 11}
# - {os: macOS-latest, r: 'devel', java: 11}
# - {os: macOS-latest, r: 'oldrel', java: 11}
# - {os: ubuntu-latest, r: 'release', java: 11}
# - {os: ubuntu-latest, r: 'devel', java: 11}
# - {os: ubuntu-latest, r: 'oldrel', java: 11}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- name: Setup java (x64)
uses: actions/setup-java@v3
uses: actions/setup-java@v4
if: matrix.java != '19'
with:
java-version: ${{ matrix.java }}
Expand All @@ -54,7 +55,7 @@ jobs:
architecture: x64

- name: Setup java (x64)
uses: actions/setup-java@v3
uses: actions/setup-java@v4
if: matrix.java == '19'
with:
java-version: ${{ matrix.java }}
Expand All @@ -63,7 +64,7 @@ jobs:
architecture: x64

- name: Setup java (x86)
uses: actions/setup-java@v3
uses: actions/setup-java@v4
if: runner.os == 'windows' && matrix.java != '19'
with:
java-version: ${{ matrix.java }}
Expand All @@ -72,7 +73,7 @@ jobs:
architecture: x86

- name: Setup java (x86)
uses: actions/setup-java@v3
uses: actions/setup-java@v4
if: runner.os == 'windows' && matrix.java == '19'
with:
java-version: ${{ matrix.java }}
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/check-changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Check changelog

on: [ push, pull_request ]

jobs:
check-changelog-job:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0

- uses: jbangdev/jbang-action@v0.115.0
with:
script: com.github.nbbrd.heylogs:heylogs-cli:0.7.2:bin
scriptargs: "check NEWS.md"
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
139 changes: 139 additions & 0 deletions .github/workflows/pr-commands.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
issue_comment:
types: [created]

name: Commands

jobs:
document:
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/document') }}
name: document
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/pr-fetch@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17'

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- name: Set up for RProtoBuf
run: sudo apt-get update -y && sudo apt-get install protobuf-compiler libprotobuf-dev libprotoc-dev

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::roxygen2
needs: pr-document

- name: Document
run: roxygen2::roxygenise()
shell: Rscript {0}

- name: Config git
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
# Check if there are any changes
- name: Check for changes
id: check-changes
run: |
if git diff --quiet -- NAMESPACE man/; then
echo "has-changed=false" >> "$GITHUB_OUTPUT"
else
echo "has-changed=true" >> "$GITHUB_OUTPUT"
fi
- name: Commit the changes
if: ${{ steps.check-changes.outputs.has-changed == 'true' }}
run: |
git add man/\* NAMESPACE
git commit -m '[GHA] Document package'
# Commit changes or a placeholder commit if no changes
- name: Commit no changes
if: ${{ steps.check-changes.outputs.has-changed == 'false' }}
run: |
git commit --allow-empty -m '[GHA] Package already documented'
- uses: r-lib/actions/pr-push@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

style:
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/style') }}
name: style
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/pr-fetch@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17'

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- name: Set up for RProtoBuf
run: sudo apt-get update -y && sudo apt-get install protobuf-compiler libprotobuf-dev libprotoc-dev

- name: Install dependencies
run: install.packages("styler")
shell: Rscript {0}

- name: Style
run: styler::style_pkg(transformers = styler::tidyverse_style(indent_by = 4))
shell: Rscript {0}

- name: Config git
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com"
# Check if there are any changes
- name: Check for changes
id: check-changes
run: |
if git diff --quiet -- '*.R'; then
echo "has-changed=false" >> "$GITHUB_OUTPUT"
else
echo "has-changed=true" >> "$GITHUB_OUTPUT"
fi
- name: Commit the changes
if: ${{ steps.check-changes.outputs.has-changed == 'true' }}
run: |
git add \*.R
git commit -m '[GHA] Style package'
# Commit changes or a placeholder commit if no changes
- name: Commit no changes
if: ${{ steps.check-changes.outputs.has-changed == 'false' }}
run: |
git commit --allow-empty -m '[GHA] Package already styled'
- uses: r-lib/actions/pr-push@v2
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
54 changes: 54 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
workflow_dispatch

name: test-coverage

jobs:
test-coverage:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '17'

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr
needs: coverage

- name: Test coverage
run: |
covr::codecov(
quiet = FALSE,
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
shell: Rscript {0}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
56 changes: 52 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,55 @@
.Rproj.user
# History files
.Rhistory
.Rapp.history

# Session Data files
.RData
/doc/
/Meta/
.RDataTmp

# User-specific files
.Ruserdata

# Example code in package build process
*-Ex.R

# Output files from R CMD build
/*.tar.gz

# Output files from R CMD check
/*.Rcheck/

# RStudio files
.Rproj.user/

# produced vignettes
vignettes/*.html
vignettes/*.pdf
Meta/
inst/doc/
doc/

# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
.httr-oauth

# knitr and R markdown default cache directories
*_cache/
/cache/

# Temporary files created by R markdown
*.utf8.md
*.knit.md

# R Environment Variables
.Renviron

# pkgdown site
docs/

# translation temp files
po/*~

# RStudio Connect folder
rsconnect/

TO_DO
# Hidden file from mac-os
.DS_Store
Loading

0 comments on commit 6a82581

Please sign in to comment.