Skip to content

Commit

Permalink
Merge tag 'v3.2.1' into docs
Browse files Browse the repository at this point in the history
tibble 3.2.1

- Use symbol instead of string in `.Call()`.
  • Loading branch information
krlmlr committed Dec 15, 2024
2 parents dcd4da6 + 14a68c8 commit 01424f3
Show file tree
Hide file tree
Showing 164 changed files with 3,265 additions and 30,328 deletions.
7 changes: 7 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,10 @@
^tests/testthat/helper-rstudio\.R$
^vignettes/invariants\.md$
^bench$
^configure$
^R/aaa-r-version\.R$
^src/version\.txt$
^\.Rprofile$
^src/Makevars\.debug$
^\.vscode$
^\.gitpod\.yml$
6 changes: 6 additions & 0 deletions .Rprofile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Can't add to .Renviron, because it overshadows ~/.Renvion
Sys.setenv(R_MAKEVARS_USER = "Makevars.debug")

if (file.exists("~/.Rprofile")) {
source("~/.Rprofile")
}
66 changes: 57 additions & 9 deletions .github/workflows/R-CMD-check-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# Can't be run as part of commits
on:
schedule:
- cron: '5 0 * * *' # 05:00 UTC every day only run on main branch
- cron: "5 0 * * *" # 05:00 UTC every day only run on main branch
push:
branches:
- "cran-*"
- "cran-*"
tags:
- "v*"
- "v*"

name: rcc dev

Expand All @@ -20,7 +20,7 @@ jobs:
name: Collect deps

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

- uses: ./.github/workflows/rate-limit
with:
Expand All @@ -34,8 +34,11 @@ jobs:
uses: ./.github/workflows/dep-matrix

check-matrix:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
needs: matrix

name: Check deps

steps:
- name: Install json2yaml
run: |
Expand All @@ -48,10 +51,55 @@ jobs:
echo $matrix | jq .
echo $matrix | json2yaml
R-CMD-check-base:
runs-on: ubuntu-22.04

name: base

# Begin custom: services
# End custom: services

strategy:
fail-fast: false

steps:
- uses: actions/checkout@v3

- uses: ./.github/workflows/custom/before-install
if: hashFiles('.github/workflows/custom/before-install/action.yml') != ''

- uses: ./.github/workflows/install
with:
install-r: false
cache-version: rcc-dev-base-1
needs: check
extra-packages: "any::rcmdcheck any::remotes ."
token: ${{ secrets.GITHUB_TOKEN }}

- name: Session info
run: |
options(width = 100)
if (!requireNamespace("sessioninfo", quietly = TRUE)) install.packages("sessioninfo")
pkgs <- installed.packages()[, "Package"]
sessioninfo::session_info(pkgs, include_base = TRUE)
shell: Rscript {0}

- uses: ./.github/workflows/custom/after-install
if: hashFiles('.github/workflows/custom/after-install/action.yml') != ''

- uses: ./.github/workflows/update-snapshots
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository

- uses: ./.github/workflows/check
with:
results: ${{ matrix.package }}

R-CMD-check-dev:
needs: matrix
needs:
- matrix
- R-CMD-check-base

runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

name: ${{ matrix.package }}

Expand All @@ -63,7 +111,7 @@ jobs:
matrix: ${{fromJson(needs.matrix.outputs.matrix)}}

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

- uses: ./.github/workflows/custom/before-install
if: hashFiles('.github/workflows/custom/before-install/action.yml') != ''
Expand Down Expand Up @@ -99,4 +147,4 @@ jobs:

- uses: ./.github/workflows/check
with:
results: ${{ matrix.package }}
results: ${{ matrix.package }}
24 changes: 12 additions & 12 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- main
- master
schedule:
- cron: '10 0 * * *'
- cron: "10 0 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}
Expand All @@ -34,7 +34,7 @@ jobs:
# End custom: services

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

- uses: ./.github/workflows/rate-limit
with:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
# End custom: services

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ needs.rcc-smoke.outputs.sha }}

Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
- {os: windows-latest, r: '3.6'}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ needs.rcc-smoke.outputs.sha }}

Expand Down Expand Up @@ -179,32 +179,32 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: macos-latest, r: 'release'}

- {os: ubuntu-20.04, r: 'release'}

# Use older ubuntu to maximise backward compatibility
- {os: ubuntu-18.04, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-18.04, r: 'release', covr: true, desc: 'with covr'}
- {os: ubuntu-18.04, r: 'oldrel-1'}
- {os: ubuntu-22.04, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-22.04, r: 'release', covr: true, desc: 'with covr'}
- {os: ubuntu-22.04, r: 'oldrel-1'}

# Begin custom: R 3.6
- {os: ubuntu-18.04, r: 'oldrel-2'}
- {os: ubuntu-22.04, r: 'oldrel-2'}
# End custom: R 3.6

# Begin custom: R 3.5
- {os: ubuntu-18.04, r: 'oldrel-3'}
- {os: ubuntu-22.04, r: 'oldrel-3'}
# End custom: R 3.5

# Begin custom: R 3.4
- {os: ubuntu-18.04, r: 'oldrel-4'}
- {os: ubuntu-22.04, r: 'oldrel-4'}
# End custom: R 3.4

# Begin custom: matrix elements
# End custom: matrix elements

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ needs.rcc-smoke.outputs.sha }}

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/check/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Actions to check an R package'
name: "Actions to check an R package"
inputs:
results:
description: Slug for check results
Expand All @@ -9,6 +9,8 @@ runs:
steps:
- uses: r-lib/actions/check-r-package@v2
with:
# Fails on R 3.6 on Windows, remove when this job is removed?
args: 'c("--no-manual", "--as-cran", "--no-multiarch")'
error-on: ${{ env.RCMDCHECK_ERROR_ON || '"note"' }}

- name: Run coverage check
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/commit/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Action to commit changes to the repository'
name: "Action to commit changes to the repository"
outputs:
sha:
description: "SHA of generated commit"
Expand All @@ -24,6 +24,6 @@ runs:
git add .
git commit -m "Auto-update from GitHub Actions"$'\n'$'\n'"Run: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
git push -u origin HEAD
echo ::set-output name=sha::$(git rev-parse HEAD)
echo sha=$(git rev-parse HEAD) >> $GITHUB_OUTPUT
fi
shell: bash
54 changes: 31 additions & 23 deletions .github/workflows/continuous-benchmarks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,43 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repo
uses: actions/checkout@master
- uses: actions/checkout@v3

- name: Setup R
uses: r-lib/actions/setup-r@master
with:
r-version: 'release'
- uses: ./.github/workflows/git-identity

- name: Install dependencies
run: |
install.packages("remotes")
remotes::install_deps(dependencies = TRUE)
remotes::install_github("r-lib/bench")
if (!requireNamespace("here", quietly = TRUE)) install.packages("here")
shell: Rscript {0}
- uses: ./.github/workflows/custom/before-install
if: hashFiles('.github/workflows/custom/before-install/action.yml') != ''

- name: Install package
run: R CMD INSTALL .
- uses: ./.github/workflows/install
with:
r-version: ${{ matrix.config.r }}
cache-version: cb-1
token: ${{ secrets.GITHUB_TOKEN }}
extra-packages: r-lib/bench
needs: check

- name: Fetch existing benchmarks
run: Rscript -e 'bench::cb_fetch()'
- uses: ./.github/workflows/custom/after-install
if: hashFiles('.github/workflows/custom/after-install/action.yml') != ''

- name: Run benchmarks
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Actions"
Rscript -e 'bench::cb_run()'
success <- FALSE
for (i in 1:100) {
message("Attempt ", i)
bench::cb_fetch()
bench::cb_run()
tryCatch(
{
bench::cb_push()
success <- TRUE
break
},
error = identity
)
system("git push . :refs/notes/benchmarks")
}
stopifnot(success)
shell: Rscript {0}

- name: Show benchmarks
run: git notes --ref benchmarks show

- name: Push benchmarks
run: Rscript -e "bench::cb_push()"
4 changes: 2 additions & 2 deletions .github/workflows/dep-matrix/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Actions to compute a matrix with all dependent packages'
name: "Actions to compute a matrix with all dependent packages"
outputs:
matrix:
description: "Generated matrix"
Expand Down Expand Up @@ -130,5 +130,5 @@ runs:
']}'
)
writeLines(json)
writeLines(paste0("::set-output name=matrix::", json))
writeLines(paste0("matrix=", json), Sys.getenv("GITHUB_OUTPUT"))
shell: Rscript {0}
53 changes: 53 additions & 0 deletions .github/workflows/fledge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: fledge

on:
# for manual triggers
workflow_dispatch:
# daily run
schedule:
- cron: "30 0 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref || '' }}-${{ github.base_ref || '' }}
cancel-in-progress: true

jobs:
check_fork:
runs-on: ubuntu-latest
outputs:
is_forked: ${{ steps.check.outputs.is_forked }}
steps:
- name: Check if the repo is forked
id: check
run: |
echo "is_forked=$(curl -s -H "Accept: application/vnd.github+json" -H 'Authorization: Bearer ${{ github.token }}' -H "X-GitHub-Api-Version: 2022-11-28" ${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY} | jq .fork)" >> $GITHUB_OUTPUT
fledge:
runs-on: ubuntu-latest
needs: check_fork
if: needs.check_fork.outputs.is_forked == 'false'
permissions:
contents: write
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
FLEDGE_GHA_CI: true
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0

- uses: ./.github/workflows/git-identity

- uses: ./.github/workflows/install
with:
token: ${{ secrets.GITHUB_TOKEN }}
install-r: false
cache-version: fledge-1
packages: cynkra/fledge

- name: Bump version
run: |
if (fledge::bump_version(which = "dev", no_change_behavior = "noop")) {
fledge::finalize_version(push = TRUE)
}
shell: Rscript {0}
4 changes: 2 additions & 2 deletions .github/workflows/get-extra/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Action to determine extra packages to be installed'
name: "Action to determine extra packages to be installed"
outputs:
packages:
description: "List of extra packages"
Expand All @@ -12,5 +12,5 @@ runs:
run: |
set -x
packages=$( ( grep Config/gha/extra-packages DESCRIPTION || true ) | cut -d " " -f 2)
echo ::set-output name=packages::$packages
echo packages=$packages >> $GITHUB_OUTPUT
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/git-identity/action.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Actions to set up a Git identity'
name: "Actions to set up a Git identity"

runs:
using: "composite"
Expand Down
Loading

0 comments on commit 01424f3

Please sign in to comment.