diff options
| -rw-r--r-- | .github/ISSUE_TEMPLATE/2_Feature_request.md | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 4 | ||||
| -rw-r--r-- | doc/release.md | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.github/ISSUE_TEMPLATE/2_Feature_request.md b/.github/ISSUE_TEMPLATE/2_Feature_request.md index 1a0a39859..0676e4636 100644 --- a/.github/ISSUE_TEMPLATE/2_Feature_request.md +++ b/.github/ISSUE_TEMPLATE/2_Feature_request.md @@ -7,7 +7,7 @@ about: Suggest an idea for this project Hi there! Thank you for wanting to make pylint better. Before you submit this, make sure that this feature wasn't - already requested or if it is not already implemented in the master branch. + already requested or if it is not already implemented in the main branch. --> ### Is your feature request related to a problem? Please describe diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 453a5205a..2eec5b96c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main - 2.* pull_request: ~ diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e5d630360..c00e72869 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [master] + branches: [main] pull_request: # The branches below must be a subset of the branches above - branches: [master] + branches: [main] schedule: - cron: "44 16 * * 4" diff --git a/doc/release.md b/doc/release.md index e8185c348..151c638e8 100644 --- a/doc/release.md +++ b/doc/release.md @@ -15,14 +15,14 @@ So, you want to release the `X.Y.Z` version of pylint ? ## Post release -### Merge tags in master for pre-commit +### Merge tags in main for pre-commit If the tag you just made is not part of the main branch, merge the tag `vX.Y.Z` in the main branch by doing a history only merge. It's done in order to signal that this is an official release tag, and for `pre-commit autoupdate` to works. ```bash -git checkout master +git checkout main git merge --no-edit --strategy=ours vX.Y.Z git push ``` @@ -42,7 +42,7 @@ issue labelled as blocker. tbump X.Y.Z-dev0 --no-tag --no-push # You can interrupt during copyrite ``` -Check the result and then upgrade the master branch +Check the result and then upgrade the main branch #### Whatsnew |