Skip to content

Commit

Permalink
Merged changes from rstudio/main
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathan-g committed May 16, 2023
2 parents 705817b + 96193a9 commit 3ee78c4
Show file tree
Hide file tree
Showing 23 changed files with 308 additions and 255 deletions.
45 changes: 23 additions & 22 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity and
orientation.
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.
Expand All @@ -21,25 +21,25 @@ community include:
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall
community
community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* The use of sexualized language or imagery, and sexual attention or advances of
any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Publishing others' private information, such as a physical or email address,
without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards
of acceptable behavior and will take appropriate and fair corrective action in
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Expand All @@ -50,16 +50,17 @@ decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies
when an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail
address, posting via an official social media account, or acting as an appointed
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at codeofconduct@rstudio.com. All complaints will be reviewed and investigated promptly and fairly.
reported to the community leaders responsible for enforcement at codeofconduct@posit.co.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.
Expand Down Expand Up @@ -113,13 +114,13 @@ community.
## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0,
available at <https://www.contributor-covenant.org/version/2/0/code_of_conduct.html>.
version 2.1, available at
<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org
Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][https://github.com/mozilla/inclusion].

For answers to common questions about this code of conduct, see the FAQ at
<https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.

[homepage]: https://www.contributor-covenant.org
74 changes: 37 additions & 37 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
# 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
#
# NOTE: This workflow is overkill for most R packages and
# check-standard.yaml is likely a better choice.
# usethis::use_github_action("check-standard") will install it.
on:
push:
branches:
- main
- master
branches: [ main, master ]
paths-ignore:
- 'pkgdown/**'
- '.github/workflows/pkgdown.yaml'
pull_request:
branches:
- main
- master
branches: [ main, master ]
paths-ignore:
- 'pkgdown/**'
- '.github/workflows/pkgdown.yaml'
workflow_dispatch:

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}
name: ${{ matrix.config.os }} (${{ matrix.config.r }}) [Pandoc ${{ matrix.config.pandoc }}]

name: ${{ matrix.config.os }} (${{ matrix.config.r }}) [Pandoc ${{matrix.config.pandoc}}]

strategy:
fail-fast: false
matrix:
config:
# testing R release with last shipped pandoc version in RStudio IDE and new pandoc
- {os: windows-latest, pandoc: '2.19', r: 'release'}
- {os: macOS-latest, pandoc: '2.19', r: 'release'}
- {os: windows-latest, pandoc: '3.1.1', r: 'release'}
- {os: macOS-latest, pandoc: '3.1.1', r: 'release'}
- {os: ubuntu-latest, pandoc: 'devel', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.19', r: 'release'}
# testing older pandoc versions
- {os: ubuntu-latest, pandoc: '2.19.2', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.18', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.17.1.1', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.16.2', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.14.2', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.11.4', r: 'release'}
# Does not shipped with pandoc-citeproc so can't test without installing it
# - {os: ubuntu-latest, pandoc: '2.5', r: 'release'}
# - {os: ubuntu-latest, pandoc: '2.0.0.1', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.7.3', r: 'release'}
- {os: ubuntu-latest, pandoc: '2.5', r: 'release'}
# testing other R versions
- {os: ubuntu-latest, pandoc: '2.14.2', r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, pandoc: '2.14.2', r: 'oldrel-1'}
- {os: ubuntu-latest, pandoc: '2.14.2', r: 'oldrel-2'}
- {os: ubuntu-latest, pandoc: '2.14.2', r: 'oldrel-3'}
- {os: ubuntu-latest, pandoc: '2.14.2', r: 'oldrel-4'}
- {os: ubuntu-latest, pandoc: '2.11.4', r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, pandoc: '2.11.4', r: 'oldrel-1'}
- {os: ubuntu-latest, pandoc: '2.11.4', r: 'oldrel-2'}
- {os: ubuntu-latest, pandoc: '2.11.4', r: 'oldrel-3'}

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

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

- uses: r-lib/actions/setup-r@v2
with:
Expand All @@ -66,30 +66,28 @@ jobs:
run: echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV
shell: bash

- uses: r-lib/actions/setup-pandoc@v2
if: matrix.config.pandoc != 'devel'
with:
pandoc-version: ${{ matrix.config.pandoc }}

- uses: cderv/actions/setup-pandoc-nightly@nightly-pandoc
if: matrix.config.pandoc == 'devel'

- uses: r-lib/actions/setup-tinytex@v2
env:
# install full prebuilt version
TINYTEX_INSTALLER: TinyTeX

- name: Add some R options for later steps
run: |
cat("\noptions(tinytex.verbose = TRUE)\n", file = "~/.Rprofile", append = TRUE)
cat(readLines("~/.Rprofile"), sep = "\n")
shell: Rscript {0}

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

- name: Remove default installed Pandoc
if: runner.os == 'Linux'
run: sudo dpkg -r pandoc

- uses: r-lib/actions/setup-pandoc@v2
if: matrix.config.pandoc != 'devel'
with:
pandoc-version: ${{ matrix.config.pandoc }}

- uses: cderv/actions/setup-pandoc-nightly@nightly-pandoc
if: matrix.config.pandoc == 'devel'

- name: Pandoc and Tinytex info
run: |
rmarkdown::find_pandoc()
Expand All @@ -98,9 +96,11 @@ jobs:
shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true

- name: Test coverage
if: success() && runner.os == 'Linux' && matrix.config.r == 'release' && matrix.config.pandoc == '2.7.3'
if: success() && runner.os == 'Linux' && matrix.config.r == 'release' && matrix.config.pandoc == '2.19.2'
run: |
pak::pkg_install('covr')
covr::codecov()
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/check-pandoc-daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,5 @@ jobs:
shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
48 changes: 48 additions & 0 deletions .github/workflows/lock.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# From https://github.com/marketplace/actions/lock-threads
name: 'Lock threads'

on:
schedule:
- cron: '10 5 * * 3'

jobs:
lock:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v4
with:
github-token: ${{ github.token }}
issue-inactive-days: '180'
# exclude-issue-created-before: ''
# exclude-issue-created-after: ''
# exclude-issue-created-between: ''
# exclude-issue-closed-before: ''
# exclude-issue-closed-after: ''
# exclude-issue-closed-between: ''
# include-any-issue-labels: ''
# include-all-issue-labels: ''
# exclude-any-issue-labels: ''
# add-issue-labels: ''
# remove-issue-labels: ''
issue-comment: >
This old thread has been automatically locked. If you think you have
found something related to this, please open a new issue by following
the issue guide (<https://yihui.org/issue/>), and link to this
old issue if necessary.
issue-lock-reason: 'resolved'
pr-inactive-days: '180'
# exclude-pr-created-before: ''
# exclude-pr-created-after: ''
# exclude-pr-created-between: ''
# exclude-pr-closed-before: ''
# exclude-pr-closed-after: ''
# exclude-pr-closed-between: ''
# include-any-pr-labels: ''
# include-all-pr-labels: ''
# exclude-any-pr-labels: ''
# add-pr-labels: ''
# remove-pr-labels: ''
# pr-comment: ''
# pr-lock-reason: 'resolved'
# process-only: ''
# log-output: false
31 changes: 0 additions & 31 deletions .github/workflows/lock.yml

This file was deleted.

29 changes: 15 additions & 14 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
# 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:
push:
branches:
- main
- master
branches: [main, master]
pull_request:
branches:
- main
- master
branches: [main, master]
release:
types: [published]
workflow_dispatch:

name: pkgdown

jobs:
pkgdown:
if: ${{ github.event_name == 'push' || startsWith(github.head_ref, 'pkgdown/') }}
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

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

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

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

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: |
any::pkgdown
local::.
extra-packages: any::pkgdown, local::.
needs: website

- name: Build pkgdown site
run: pkgdown::build_site(new_process = FALSE)
run: pkgdown::build_site(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to Netlify
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-citation-cff.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
Loading

0 comments on commit 3ee78c4

Please sign in to comment.