diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 6ca294b142..064677b490 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,12 +1,18 @@ +# 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: - - master + branches: [main, master] pull_request: - branches: - - master + branches: [main, master] -name: R-CMD-check +name: R-CMD-check.yaml + +permissions: read-all jobs: R-CMD-check: @@ -21,26 +27,22 @@ jobs: - {os: macos-latest, r: 'release'} - {os: windows-latest, r: 'release'} - # # use 4.2 to check with rtools42's older compiler - - {os: windows-latest, r: '4.2'} - # # use 4.1 to check with rtools40's older compiler - - {os: windows-latest, r: '4.1'} - - - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - - {os: ubuntu-latest, r: 'release'} - - {os: ubuntu-latest, r: 'oldrel-1'} - - {os: ubuntu-latest, r: 'oldrel-2'} - - {os: ubuntu-latest, r: 'oldrel-3'} - - {os: ubuntu-latest, r: 'oldrel-4'} + # use 4.0 or 4.1 to check with rtools40's older compiler + - {os: windows-latest, r: 'oldrel-4'} + + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'oldrel-1'} + - {os: ubuntu-latest, r: 'oldrel-2'} + - {os: ubuntu-latest, r: 'oldrel-3'} + - {os: ubuntu-latest, r: 'oldrel-4'} env: - R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - GITHUB_PAT: ${{ secrets.GHA_PAT }} + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} R_KEEP_PKG_SOURCE: yes steps: - - name: Check out repository - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 @@ -58,3 +60,4 @@ jobs: - uses: r-lib/actions/check-r-package@v2 with: upload-snapshots: true + build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index ac890373a7..4bbce75080 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -9,7 +9,7 @@ on: types: [published] workflow_dispatch: -name: pkgdown +name: pkgdown.yaml permissions: read-all @@ -26,12 +26,6 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: quarto-dev/quarto-actions/setup@v2 - with: - tinytex: true - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-r@v2 diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index fefc52e271..988226098e 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -6,7 +6,7 @@ on: pull_request: branches: [main, master] -name: test-coverage +name: test-coverage.yaml permissions: read-all diff --git a/R/tab_create_modify.R b/R/tab_create_modify.R index de5dfccbd8..5e444d037a 100644 --- a/R/tab_create_modify.R +++ b/R/tab_create_modify.R @@ -772,7 +772,7 @@ tab_spanner <- function( data <- cols_move( data = data, - columns = column_names, + columns = dplyr::all_of(column_names), after = column_names[1] ) } @@ -1267,10 +1267,10 @@ tab_spanner_delim <- function( # Increment number to spanner ID values on subsequent duplications idx_str <- gsub("^spanner:([0-9]+)-.*", "\\1", spanner_id) - + idx_int <- as.integer(idx_str) - spanner_id <- + spanner_id <- gsub( "^(spanner:)[0-9]+(-.*)", paste0("\\1", idx_int + 1, "\\2"), diff --git a/README.md b/README.md index c98bbd5bca..9b05635304 100644 --- a/README.md +++ b/README.md @@ -3,22 +3,22 @@ -CRAN status -License: MIT -R build status -Coverage status +[![CRAN status](https://www.r-pkg.org/badges/version/gt)](https://CRAN.R-project.org/package=gt) +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +[![R-CMD-check](https://github.com/rstudio/gt/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rstudio/gt/actions/workflows/R-CMD-check.yaml) +[![Codecov test coverage](https://codecov.io/gh/rstudio/gt/graph/badge.svg)](https://app.codecov.io/gh/rstudio/gt) -Best Practices -The project has reached a stable, usable state and is being actively developed. -Monthly Downloads -Total Downloads +[![Best Practices](https://bestpractices.coreinfrastructure.org/projects/5593/badge)](https://bestpractices.coreinfrastructure.org/projects/5593) +[![The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) +[![Monthly Downloads](https://cranlogs.r-pkg.org/badges/gt)](https://CRAN.R-project.org/package=gt) +[![Total Downloads](https://cranlogs.r-pkg.org/badges/grand-total/gt)](https://CRAN.R-project.org/package=gt) [![Twitter Follow](https://img.shields.io/twitter/follow/gt_package?style=social)](https://twitter.com/gt_package) [![Posit Cloud](https://img.shields.io/badge/Posit%20Cloud-gt%20Test%20Drive-blue?style=social&logo=rstudio&logoColor=75AADB)](https://rstudio.cloud/project/779965) [![Discord](https://img.shields.io/discord/1086103944280952992?color=%237289da&label=Discord)](https://discord.com/invite/Ux7nrcXHVV) -Contributor Covenant +[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.1%20adopted-ff69b4.svg)](https://www.contributor-covenant.org/version/2/1/code_of_conduct.html)

diff --git a/tests/testthat/test-as_word.R b/tests/testthat/test-as_word.R index b12b01479b..b5515df46d 100644 --- a/tests/testthat/test-as_word.R +++ b/tests/testthat/test-as_word.R @@ -1972,7 +1972,7 @@ test_that("tables preserves spaces in text & can be added to a word doc", { gt() %>% tab_style( style = cell_text(whitespace = "pre"), - location = cells_body(columns = contains("preserve")) + locations = cells_body(columns = contains("preserve")) ) ## Add table to empty word document