Prep change for changing def branch to main (#4306)

.circleci/build_docs/commit_docs.sh

@@ -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

.circleci/config.yml.in

@@ -29,7 +29,7 @@ commands:
 #         command: |
 #           set -ex
 #           BRANCH=$(git rev-parse --abbrev-ref HEAD)
-#           if [[ "$BRANCH" != "master" ]]; then
+#           if [[ "$BRANCH" != "main" ]]; then
 #             git fetch --force origin ${CIRCLE_BRANCH}/merge:merged/${CIRCLE_BRANCH}
 #             git checkout "merged/$CIRCLE_BRANCH"
 #           fi
@@ -936,7 +936,7 @@ jobs:
           command: |
             set -ex
             tag=${CIRCLE_TAG:1:5}
-            VERSION=${tag:-master}
+            VERSION=${tag:-main}
             eval "$(./conda/bin/conda shell.bash hook)"
             conda activate ./env
             pushd docs
@@ -982,7 +982,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
 
 
@@ -1029,7 +1029,7 @@ workflows:
           filters:
             branches:
               only:
-                - master
+                - main
     jobs:
       - smoke_test_docker_image_build:
           context: org-member