Unverified Commit 8a347b62 authored by Nikita Shulga's avatar Nikita Shulga Committed by GitHub
Browse files

Prep to rename default branch to `main` (#1659)

parent 70bb4920
......@@ -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
......@@ -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
......
......@@ -607,7 +607,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:
......@@ -3159,6 +3159,6 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- smoke_test_docker_image_build
......@@ -607,7 +607,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:
......@@ -644,6 +644,6 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- smoke_test_docker_image_build
......@@ -4,7 +4,7 @@ name: Bandit
on:
pull_request:
branches: [ master ]
branches: [ main ]
workflow_dispatch:
......
......@@ -4,7 +4,7 @@ name: CodeQL
on:
pull_request:
branches: [ master ]
branches: [ main ]
workflow_dispatch:
......
......@@ -94,7 +94,7 @@ Optional packages to install if you want to run related tests:
If you plan to modify the code or documentation, please follow the steps below:
1. Fork the repository and create your branch from `master`: `$ git checkout master && git checkout -b my_cool_feature`
1. Fork the repository and create your branch from `main`: `$ git checkout main && git checkout -b my_cool_feature`
2. If you have modified the code (new feature or bug-fix), [please add tests](test/torchaudio_unittest/).
3. If you have changed APIs, [update the documentation](#Documentation).
......
......@@ -31,7 +31,7 @@ The following are the corresponding ``torchaudio`` versions and supported Python
| ``torch`` | ``torchaudio`` | ``python`` |
| ------------------------ | ------------------------ | ------------------------------- |
| ``master`` / ``nightly`` | ``master`` / ``nightly`` | ``>=3.6``, ``<=3.9`` |
| ``master`` / ``nightly`` | ``main`` / ``nightly`` | ``>=3.6``, ``<=3.9`` |
| ``1.9.0`` | ``0.9.0`` | ``>=3.6``, ``<=3.9`` |
| ``1.8.0`` | ``0.8.0`` | ``>=3.6``, ``<=3.9`` |
| ``1.7.1`` | ``0.7.2`` | ``>=3.6``, ``<=3.9`` |
......
......@@ -85,10 +85,10 @@ author = 'Torchaudio Contributors'
#
# The short X.Y version.
# TODO: change to [:2] at v1.0
version = 'master '
version = 'main '
# The full version, including alpha/beta/rc tags.
# TODO: verify this works as expected
release = 'master'
release = 'main'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment