From d3e71d04566f74ad04bf1ac8e48c53f1f908fea2 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Tue, 29 Jun 2021 22:05:17 +0200 Subject: Update refs to use main --- .github/workflows/ci.yaml | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- doc/index.rst | 2 +- doc/release.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 27df17e5..db0cf2ab 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 410aecda..a3affa84 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: "30 21 * * 2" diff --git a/doc/index.rst b/doc/index.rst index 92b251ff..bf01378d 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,4 +1,4 @@ -.. Astroid documentation master file, created by +.. Astroid documentation main file, created by sphinx-quickstart on Wed Jun 26 15:00:40 2013. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. diff --git a/doc/release.md b/doc/release.md index 96fed374..3f43f6bc 100644 --- a/doc/release.md +++ b/doc/release.md @@ -23,7 +23,7 @@ tbump X.Y.Z+1-dev0 --no-tag --no-push # You can interrupt during copyrite git commit -am "Upgrade the version to x.y.z+1-dev0 following x.y.z release" ``` -Check the result and then upgrade the master branch +Check the result and then upgrade the main branch ### Milestone handling -- cgit v1.2.1