Skip to content
This repository was archived by the owner on Sep 10, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/build_docs/commit_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -ex
if [ "$2" == "" ]; then
echo call as "$0" "<src>" "<target branch>"
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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -1371,7 +1371,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- smoke_test_docker_image_build:
context: org-member
4 changes: 2 additions & 2 deletions .circleci/config.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -630,7 +630,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- smoke_test_docker_image_build:
context: org-member
2 changes: 1 addition & 1 deletion .circleci/unittest/linux/scripts/run_style_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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))"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bandit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Bandit

on:
pull_request:
branches: [ master ]
branches: [ main ]

workflow_dispatch:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: CodeQL

on:
pull_request:
branches: [ master ]
branches: [ main ]

workflow_dispatch:

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
under the LICENSE file in the root directory of this source tree.