Switch master to main in CI tools and dev tools

.github/workflows/ci-daily.yml

@@ -2,7 +2,7 @@ name: Continuous Integration - Daily
 
 on:
   schedule:
-    # Checks out master by default.
+    # Checks out main by default.
     - cron: '0 0 * * *'
 
 concurrency:

.github/workflows/ci-weekly.yml

@@ -2,7 +2,7 @@ name: Continuous Integration - Weekly
 
 on:
   schedule:
-    # Checks out master by default.
+    # Checks out main by default.
     - cron: '0 0 * * 0'
 
 concurrency:

.github/workflows/ci.yml

@@ -2,11 +2,11 @@ name: Continuous Integration
 
 on:
   schedule:
-    # Checks out master by default.
+    # Checks out main by default.
     - cron: '0 0 * * *'
   pull_request:
     branches:
-      - master
+      - main
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}

.github/workflows/release-master.yml → .github/workflows/release-main.yml

@@ -3,7 +3,7 @@ name: Pre-release cirq to PyPi
 on:
   push:
     branches:
-      - master
+      - main
 jobs:
   push_to_pypi:
     if: github.repository == 'quantumlib/Cirq'

asv.conf.json

@@ -4,7 +4,7 @@
     "project_url": "https://quantumai.google/cirq",
     "repo": ".",
     "repo_subdir": "cirq-core/",
-    "branches": ["master"],
+    "branches": ["main"],
     "dvcs": "git",
     "environment_type": "virtualenv",
     "show_commit_url": "https://github.com/quantumlib/Cirq/commit/",

check/build-changed-protos

@@ -11,14 +11,14 @@
 #
 # You can specify a base git revision to compare against (i.e. to use when
 # determining whether or not a line is considered to have "changed"). For
-# example, you can compare against 'origin/master' or 'HEAD~1'.
+# example, you can compare against 'origin/main' or 'HEAD~1'.
 #
 # If you don't specify a base revision, the following defaults will be tried, in
 # order, until one exists:
 #
-#     1. upstream/master
-#     2. origin/master
-#     3. master
+#     1. upstream/main
+#     2. origin/main
+#     3. main
 #
 # If none exists, the script fails.
 #
@@ -37,14 +37,14 @@ if [ -n "$1" ] && [[ $1 != -* ]]; then
         exit 1
     fi
     rev=$1
-elif [ "$(git cat-file -t upstream/master 2> /dev/null)" == "commit" ]; then
-    rev=upstream/master
-elif [ "$(git cat-file -t origin/master 2> /dev/null)" == "commit" ]; then
-    rev=origin/master
-elif [ "$(git cat-file -t master 2> /dev/null)" == "commit" ]; then
-    rev=master
+elif [ "$(git cat-file -t upstream/main 2> /dev/null)" == "commit" ]; then
+    rev=upstream/main
+elif [ "$(git cat-file -t origin/main 2> /dev/null)" == "commit" ]; then
+    rev=origin/main
+elif [ "$(git cat-file -t main 2> /dev/null)" == "commit" ]; then
+    rev=main
 else
-    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
+    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/main' or 'HEAD~1').\033[0m" >&2
     exit 1
 fi
 base="$(git merge-base "${rev}" HEAD)"

check/format-incremental

@@ -18,14 +18,14 @@
 #
 # You can specify a base git revision to compare against (i.e. to use when
 # determining whether or not a file is considered to have "changed"). For
-# example, you can compare against 'origin/master' or 'HEAD~1'.
+# example, you can compare against 'origin/main' or 'HEAD~1'.
 #
 # If you don't specify a base revision, the following defaults will be tried, in
 # order, until one exists:
 #
-#     1. upstream/master
-#     2. origin/master
-#     3. master
+#     1. upstream/main
+#     2. origin/main
+#     3. main
 #
 # If none exists, the script fails.
 ################################################################################
@@ -61,14 +61,14 @@ typeset -a format_files
 if (( only_changed == 1 )); then
     # Figure out which branch to compare against.
     if [ -z "${rev}" ]; then
-        if [ "$(git cat-file -t upstream/master 2> /dev/null)" == "commit" ]; then
-            rev=upstream/master
-        elif [ "$(git cat-file -t origin/master 2> /dev/null)" == "commit" ]; then
-            rev=origin/master
-        elif [ "$(git cat-file -t master 2> /dev/null)" == "commit" ]; then
-            rev=master
+        if [ "$(git cat-file -t upstream/main 2> /dev/null)" == "commit" ]; then
+            rev=upstream/main
+        elif [ "$(git cat-file -t origin/main 2> /dev/null)" == "commit" ]; then
+            rev=origin/main
+        elif [ "$(git cat-file -t main 2> /dev/null)" == "commit" ]; then
+            rev=main
         else
-            echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
+            echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/main' or 'HEAD~1').\033[0m" >&2
             exit 1
         fi
     fi

check/pylint-changed-files

@@ -9,15 +9,15 @@
 # You can specify a base git revision to compare against (i.e. to use when
 # determining whether or not a line is considered to have "changed"). To make
 # the tool more consistent, it actually diffs against the most recent common
-# ancestor of the specified id and HEAD. So if you choose 'origin/master' you're
-# actually diffing against the output of 'git merge-base origin/master HEAD'.
+# ancestor of the specified id and HEAD. So if you choose 'origin/main' you're
+# actually diffing against the output of 'git merge-base origin/main HEAD'.
 #
 # If you don't specify a base revision, the following defaults will be tried,
 # in order, until one exists:
 #
-#     1. upstream/master
-#     2. origin/master
-#     3. master
+#     1. upstream/main
+#     2. origin/main
+#     3. main
 #
 # If none exists, the script fails.
 #
@@ -36,14 +36,14 @@ if [ -n "$1" ] && [[ $1 != -* ]]; then
         exit 1
     fi
     rev=$1
-elif [ "$(git cat-file -t upstream/master 2> /dev/null)" == "commit" ]; then
-    rev=upstream/master
-elif [ "$(git cat-file -t origin/master 2> /dev/null)" == "commit" ]; then
-    rev=origin/master
-elif [ "$(git cat-file -t master 2> /dev/null)" == "commit" ]; then
-    rev=master
+elif [ "$(git cat-file -t upstream/main 2> /dev/null)" == "commit" ]; then
+    rev=upstream/main
+elif [ "$(git cat-file -t origin/main 2> /dev/null)" == "commit" ]; then
+    rev=origin/main
+elif [ "$(git cat-file -t main 2> /dev/null)" == "commit" ]; then
+    rev=main
 else
-    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
+    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/main' or 'HEAD~1').\033[0m" >&2
     exit 1
 fi
 base="$(git merge-base "${rev}" HEAD)"

check/pytest-and-incremental-coverage

@@ -9,15 +9,15 @@
 # You can specify a base git revision to compare against (i.e. to use when
 # determining whether or not a line is considered to have "changed"). To make
 # the tool more consistent, it actually diffs against the most recent common
-# ancestor of the specified id and HEAD. So if you choose 'origin/master' you're
-# actually diffing against the output of 'git merge-base origin/master HEAD'.
+# ancestor of the specified id and HEAD. So if you choose 'origin/main' you're
+# actually diffing against the output of 'git merge-base origin/main HEAD'.
 #
 # If you don't specify a base revision, the following defaults will be tried,
 # in order, until one exists:
 #
-#     1. upstream/master
-#     2. origin/master
-#     3. master
+#     1. upstream/main
+#     2. origin/main
+#     3. main
 #
 # If none exists, the script fails.
 ################################################################################
@@ -50,14 +50,14 @@ if [ -n "${BASEREV}" ]; then
         exit 1
     fi
     rev="${BASEREV}"
-elif [ "$(git cat-file -t upstream/master 2> /dev/null)" == "commit" ]; then
-    rev=upstream/master
-elif [ "$(git cat-file -t origin/master 2> /dev/null)" == "commit" ]; then
-    rev=origin/master
-elif [ "$(git cat-file -t master 2> /dev/null)" == "commit" ]; then
-    rev=master
+elif [ "$(git cat-file -t upstream/main 2> /dev/null)" == "commit" ]; then
+    rev=upstream/main
+elif [ "$(git cat-file -t origin/main 2> /dev/null)" == "commit" ]; then
+    rev=origin/main
+elif [ "$(git cat-file -t main 2> /dev/null)" == "commit" ]; then
+    rev=main
 else
-    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
+    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/main' or 'HEAD~1').\033[0m" >&2
     exit 1
 fi
 base="$(git merge-base "${rev}" HEAD)"

check/pytest-changed-files

@@ -12,14 +12,14 @@
 #
 # You can specify a base git revision to compare against (i.e. to use when
 # determining whether or not a file is considered to have "changed"). For
-# example, you can compare against 'origin/master' or 'HEAD~1'.
+# example, you can compare against 'origin/main' or 'HEAD~1'.
 #
 # If you don't specify a base revision, the following defaults will be tried, in
 # order, until one exists:
 #
-#     1. upstream/master
-#     2. origin/master
-#     3. master
+#     1. upstream/main
+#     2. origin/main
+#     3. main
 #
 # If none exists, the script fails.
 #
@@ -41,14 +41,14 @@ if [ -n "$1" ] && [[ $1 != -* ]]; then
     fi
     rev=$1
     rest=( "${@:2}" )
-elif [ "$(git cat-file -t upstream/master 2> /dev/null)" == "commit" ]; then
-    rev=upstream/master
-elif [ "$(git cat-file -t origin/master 2> /dev/null)" == "commit" ]; then
-    rev=origin/master
-elif [ "$(git cat-file -t master 2> /dev/null)" == "commit" ]; then
-    rev=master
+elif [ "$(git cat-file -t upstream/main 2> /dev/null)" == "commit" ]; then
+    rev=upstream/main
+elif [ "$(git cat-file -t origin/main 2> /dev/null)" == "commit" ]; then
+    rev=origin/main
+elif [ "$(git cat-file -t main 2> /dev/null)" == "commit" ]; then
+    rev=main
 else
-    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
+    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/main' or 'HEAD~1').\033[0m" >&2
     exit 1
 fi
 echo "Comparing against revision '${rev}'." >&2

check/pytest-changed-files-and-incremental-coverage

@@ -15,15 +15,15 @@
 # You can specify a base git revision to compare against (i.e. to use when
 # determining whether or not a line is considered to have "changed"). To make
 # the tool more consistent, it actually diffs against the most recent common
-# ancestor of the specified id and HEAD. So if you choose 'origin/master' you're
-# actually diffing against the output of 'git merge-base origin/master HEAD'.
+# ancestor of the specified id and HEAD. So if you choose 'origin/main' you're
+# actually diffing against the output of 'git merge-base origin/main HEAD'.
 #
 # If you don't specify a base revision, the following defaults will be tried,
 # in order, until one exists:
 #
-#     1. upstream/master
-#     2. origin/master
-#     3. master
+#     1. upstream/main
+#     2. origin/main
+#     3. main
 #
 # If none exists, the script fails.
 ################################################################################
@@ -39,14 +39,14 @@ if [ -n "$1" ] && [[ $1 != -* ]]; then
         exit 1
     fi
     rev=$1
-elif [ "$(git cat-file -t upstream/master 2> /dev/null)" == "commit" ]; then
-    rev=upstream/master
-elif [ "$(git cat-file -t origin/master 2> /dev/null)" == "commit" ]; then
-    rev=origin/master
-elif [ "$(git cat-file -t master 2> /dev/null)" == "commit" ]; then
-    rev=master
+elif [ "$(git cat-file -t upstream/main 2> /dev/null)" == "commit" ]; then
+    rev=upstream/main
+elif [ "$(git cat-file -t origin/main 2> /dev/null)" == "commit" ]; then
+    rev=origin/main
+elif [ "$(git cat-file -t main 2> /dev/null)" == "commit" ]; then
+    rev=main
 else
-    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/master' or 'HEAD~1').\033[0m" >&2
+    echo -e "\033[31mNo default revision found to compare against. Argument #1 must be what to diff against (e.g. 'origin/main' or 'HEAD~1').\033[0m" >&2
     exit 1
 fi
 base="$(git merge-base "${rev}" HEAD)"