diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 8bc92105d..d1a13500f 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -1,6 +1,6 @@ on: push: - branches: master + branches: main name: pkgdown diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 3058d037b..7dabe0282 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -1,10 +1,10 @@ on: push: branches: - - master + - main pull_request: branches: - - master + - main name: test-coverage diff --git a/NEWS.md b/NEWS.md index 2c4b8436f..01ef4ddfa 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,7 @@ * Alignment detection respects stylerignore (#850). * Add vignette on distributing style guide (#846). * Enable pre-commit.ci (#843). +* rename default branch to main (#859). * Fix argument name `filetype` in Example for `style_dir()` (#855). # styler 1.6.2 diff --git a/README.Rmd b/README.Rmd index 8c05c87f6..7f25cb253 100644 --- a/README.Rmd +++ b/README.Rmd @@ -19,7 +19,7 @@ knitr::opts_chunk$set( [![R build status](https://github.com/r-lib/styler/workflows/R-CMD-check/badge.svg)](https://github.com/r-lib/styler/actions) [![Life cycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) -[![codecov test coverage](https://codecov.io/gh/r-lib/styler/branch/master/graph/badge.svg)](https://codecov.io/gh/r-lib/styler) +[![codecov test coverage](https://codecov.io/gh/r-lib/styler/branch/main/graph/badge.svg)](https://codecov.io/gh/r-lib/styler) [![CRAN Status](https://www.r-pkg.org/badges/version/styler)](https://cran.r-project.org/package=styler) diff --git a/README.md b/README.md index f05c722d1..4ad42762a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ status](https://github.com/r-lib/styler/workflows/R-CMD-check/badge.svg)](https: [![Life cycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html) [![codecov test -coverage](https://codecov.io/gh/r-lib/styler/branch/master/graph/badge.svg)](https://codecov.io/gh/r-lib/styler) +coverage](https://codecov.io/gh/r-lib/styler/branch/main/graph/badge.svg)](https://codecov.io/gh/r-lib/styler) [![CRAN Status](https://www.r-pkg.org/badges/version/styler)](https://cran.r-project.org/package=styler) diff --git a/inst/hooks/require-news-update.R b/inst/hooks/require-news-update.R index 5fc72578d..05d8c950c 100755 --- a/inst/hooks/require-news-update.R +++ b/inst/hooks/require-news-update.R @@ -1,7 +1,7 @@ #! /usr/local/bin/Rscript args <- system2( "git", - c("diff", "upstream/master", "--name-only"), + c("diff", "upstream/main", "--name-only"), stdout = TRUE )