diff --git a/.circleci/build_docs/commit_docs.sh b/.circleci/build_docs/commit_docs.sh index a1b4b05297..11297f9521 100755 --- a/.circleci/build_docs/commit_docs.sh +++ b/.circleci/build_docs/commit_docs.sh @@ -6,7 +6,7 @@ set -ex if [ "$2" == "" ]; then echo call as "$0" "" "" echo where src is the root of the built documentation git checkout and - echo branch should be "master" or "1.7" or so + echo branch should be "main" or "1.7" or so exit 1 fi @@ -20,7 +20,7 @@ git checkout gh-pages mkdir -p ./"${target}" rm -rf ./"${target}"/* cp -r "${src}/docs/build/html/"* ./"$target" -if [ "${target}" == "master" ]; then +if [ "${target}" == "main" ]; then mkdir -p ./_static rm -rf ./_static/* cp -r "${src}/docs/build/html/_static/"* ./_static diff --git a/.circleci/config.yml b/.circleci/config.yml index 183112c076..ce597158dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -587,7 +587,7 @@ jobs: # https://circleci.com/docs/2.0/configuration-reference/#checkout set -ex tag=${CIRCLE_TAG:1:5} - target=${tag:-master} + target=${tag:-main} ~/workspace/.circleci/build_docs/commit_docs.sh ~/workspace $target docstring_parameters_sync: @@ -1371,7 +1371,7 @@ workflows: filters: branches: only: - - master + - main jobs: - smoke_test_docker_image_build: context: org-member diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index a51a332c5d..c8e846ea0a 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -587,7 +587,7 @@ jobs: # https://circleci.com/docs/2.0/configuration-reference/#checkout set -ex tag=${CIRCLE_TAG:1:5} - target=${tag:-master} + target=${tag:-main} ~/workspace/.circleci/build_docs/commit_docs.sh ~/workspace $target docstring_parameters_sync: @@ -630,7 +630,7 @@ workflows: filters: branches: only: - - master + - main jobs: - smoke_test_docker_image_build: context: org-member diff --git a/.circleci/unittest/linux/scripts/run_style_checks.sh b/.circleci/unittest/linux/scripts/run_style_checks.sh index c44c1d6554..4c2b44f293 100755 --- a/.circleci/unittest/linux/scripts/run_style_checks.sh +++ b/.circleci/unittest/linux/scripts/run_style_checks.sh @@ -22,7 +22,7 @@ fi printf "\x1b[34mRunning clang-format: " ./clang-format --version printf "\x1b[0m\n" -git-clang-format --binary ./clang-format origin/master +git-clang-format --binary ./clang-format origin/main git diff --exit-code status=$? exit_status="$((exit_status+status))" diff --git a/.github/workflows/bandit.yml b/.github/workflows/bandit.yml index 93bae80f9b..84200b438a 100644 --- a/.github/workflows/bandit.yml +++ b/.github/workflows/bandit.yml @@ -4,7 +4,7 @@ name: Bandit on: pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index b983ccaab7..b35d14db70 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -4,7 +4,7 @@ name: CodeQL on: pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 19bd6a8fb3..ff12f88ff3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,7 +5,7 @@ possible. ## Pull Requests We actively welcome your pull requests. -1. Fork the repo and create your branch from `master`. +1. Fork the repo and create your branch from `main`. 2. If you've added code that should be tested, add tests. 3. If you've changed APIs, update the documentation. 4. Ensure the test suite passes. @@ -28,4 +28,4 @@ outlined on that page and do not file a public issue. ## License By contributing to text, you agree that your contributions will be licensed -under the LICENSE file in the root directory of this source tree. \ No newline at end of file +under the LICENSE file in the root directory of this source tree.