Rename master branch to main. (#8452)

diff --git a/.github/actions/store-binary/action.yml b/.github/actions/store-binary/action.yml
index 00986aec393e62dc664a26fa889ed772b465e790..9e339f8d4609831fcc1ee7dbfb2c8131bbd2b939 100644 (file)
--- a/.github/actions/store-binary/action.yml
+++ b/.github/actions/store-binary/action.yml
@@ -21,7 +21,7 @@ runs:
         python3 -m pip install pyGithub
 
     - name: store to latest
-      if: github.ref == 'refs/heads/master'
+      if: github.ref == 'refs/heads/main'
       shell: 'python3 {0}'
       env:
         GITHUB_TOKEN: ${{ inputs.github-token }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e825ab3d19785f64de29e499d11e0777c5de64f0..3da70c4538a4d508b9d5017498d00378f7128250 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -128,7 +128,7 @@ jobs:
         build-dir: ${{ steps.configure-and-build.outputs.shared-build-dir }}
 
     - name: Add binary to latest and release
-      if: matrix.binary-name && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/'))
+      if: matrix.binary-name && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
       uses: ./.github/actions/store-binary
       with:
         binary: ${{ steps.configure-and-build.outputs.static-build-dir }}/bin/cvc5${{ matrix.binary-ext }}
@@ -143,5 +143,5 @@ jobs:
         uses: adRise/update-pr-branch@v0.5.1
         with:
           token: ${{ secrets.ACTION_USER_TOKEN }}
-          base: 'master'
+          base: 'main'
           required_approval_count: 1

diff --git a/.github/workflows/docs_upload.yml b/.github/workflows/docs_upload.yml
index 05d746491818d3bb45dacfce1efbab65f1dc6528..b2ac38089dd864baade474a3b2bc2b6fab97f494 100644 (file)
--- a/.github/workflows/docs_upload.yml
+++ b/.github/workflows/docs_upload.yml
@@ -49,8 +49,8 @@ jobs:
           linkchecker --check-extern docs-new/index.html
 
 # This workflow is run for commits in PRs (from branches in forks), commits
-# (from branches in main repo, usually master) and tags. Unfortunately, there
-# are only two properties in the github context that can be used here:
+# (from branches in main repo, usually main branch) and tags. Unfortunately,
+# there are only two properties in the github context that can be used here:
 # - workflow_run.event is "pull_request" for PRs and "push" otherwise
 # - workflow_run.head_branch contains the branch or tag name
 # We can not reliably identify a tag from that, so we simply match the
@@ -91,11 +91,11 @@ jobs:
             cp -r docs-new target/docs-$NAME-$HASH
             cd target/
 
-            isdiff=$(diff -r -x "*.zip" docs-master/ docs-$NAME-$HASH >&2; echo $?; exit 0)
+            isdiff=$(diff -r -x "*.zip" docs-main/ docs-$NAME-$HASH >&2; echo $?; exit 0)
 
             if [[ ("$ISRELEASE" != true) && ($isdiff = 0) ]]
             then
-              echo "Ignored run, documentation is the same as for current master"
+              echo "Ignored run, documentation is the same as for current main"
             else
               rm -f docs-$NAME
               ln -s docs-$NAME-$HASH docs-$NAME

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a1efb165a6d1118c2d15b239ec7c1538a08a5821..9aa69b3b3318f84605867f0df3e001550e42f587 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,9 +7,9 @@ mechanism.  The following terms apply to all such contributions:
   being submitted and to be signed using `git commit -s`.
 
 - cvc5 is distributed under the terms of the modified BSD license (see
-  [COPYING](https://github.com/cvc5/cvc5/blob/master/COPYING) file).  By
+  [COPYING](https://github.com/cvc5/cvc5/blob/main/COPYING) file).  By
   submitting a signed contribution, you automatically agree to accept the conditions
-  described in [COPYING](https://github.com/cvc5/cvc5/blob/master/COPYING).
+  described in [COPYING](https://github.com/cvc5/cvc5/blob/main/COPYING).
 
 - By submitting a signed contribution, you additionally automatically agree
   that the [Developer Certificate of Origin](https://developercertificate.org)

diff --git a/README.md b/README.md
index fa6c4a10e45a2e7828b724cebb251be1e267848d..c4f64bc02efbd03f223537cd4c9d69d621fc48fe 100644 (file)
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ cvc5 is intended to be an open and extensible SMT engine.  It can be used as a
 stand-alone tool or as a library.  It has been designed to increase the
 performance and reduce the memory overhead of its predecessors.  It is written
 entirely in C++ and is released under an open-source software license (see file
-[COPYING](https://github.com/cvc5/cvc5/blob/master/COPYING)).
+[COPYING](https://github.com/cvc5/cvc5/blob/main/COPYING)).
 
 
 Website
@@ -47,7 +47,7 @@ The latest version of cvc5 is available on GitHub:
 https://github.com/cvc5/cvc5
 
 Source tar balls and binaries for releases of the
-[master branch](https://github.com/cvc5/cvc5) can be
+[main branch](https://github.com/cvc5/cvc5) can be
 found [here](https://github.com/cvc5/cvc5/releases).
 Nightly builds are available [here](https://cvc5.github.io/downloads).
 
@@ -59,7 +59,7 @@ cvc5 can be built on Linux and macOS.  For Windows, cvc5 can be cross-compiled
 using Mingw-w64.
 
 For detailed build and installation instructions on these platforms,
-see file [INSTALL.rst](https://github.com/cvc5/cvc5/blob/master/INSTALL.rst).
+see file [INSTALL.rst](https://github.com/cvc5/cvc5/blob/main/INSTALL.rst).
 
 
 Bug Reports
@@ -80,4 +80,4 @@ Authors
 -------------------------------------------------------------------------------
 
 For a full list of authors, please refer to the
-[AUTHORS](https://github.com/cvc5/cvc5/blob/master/AUTHORS) file.
+[AUTHORS](https://github.com/cvc5/cvc5/blob/main/AUTHORS) file.

diff --git a/contrib/make-release.py b/contrib/make-release.py
index 1d04d3952ae665ede1804c4601a3e6c5d79f1510..2f673a7deb9c7c932674615acd84161d1144820e 100755 (executable)
--- a/contrib/make-release.py
+++ b/contrib/make-release.py
@@ -117,4 +117,4 @@ if __name__ == '__main__':
     print(
         'If you are sure you want to push this release, use the following command:'
     )
-    print('\tgit push --tags origin master')
+    print('\tgit push --tags origin main')

diff --git a/docs/conf.py.in b/docs/conf.py.in
index 4d54a49d8b92f246da08ec647dc66b22d4ae5ff9..5817c586e59d1e39111c651e4aa3fdee07c9e9ef 100644 (file)
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -102,8 +102,8 @@ autosectionlabel_prefix_document = True
 # -- core extension:: sphinx.ext.extlinks ------------------------------------
 
 extlinks = {
-        'cvc5src': ('https://github.com/cvc5/cvc5/blob/master/src/%s', '%s'),
-        'cvc5repo': ('https://github.com/cvc5/cvc5/blob/master/%s', '%s'),
+        'cvc5src': ('https://github.com/cvc5/cvc5/blob/main/src/%s', '%s'),
+        'cvc5repo': ('https://github.com/cvc5/cvc5/blob/main/%s', '%s'),
 }
 
 
@@ -185,7 +185,7 @@ examples_types = {
 examples_file_patterns = {
         '^<examples>(.*)': {
                 'local': '/../examples{}',
-                'url': 'https://github.com/cvc5/cvc5/tree/master/examples{}',
+                'url': 'https://github.com/cvc5/cvc5/tree/main/examples{}',
                 'urlname': 'examples{}',
         },
         '<z3pycompat>(.*)': {

diff --git a/src/base/configuration.cpp b/src/base/configuration.cpp
index 42e6762a94403a71e95616926f46d826ab247eb0..50feb2926132b702d8eabb9450bf050cd2ca71da 100644 (file)
--- a/src/base/configuration.cpp
+++ b/src/base/configuration.cpp
@@ -154,7 +154,7 @@ std::string Configuration::copyright() {
       ss << "cvc5 is statically linked against these libraries. To recompile\n"
             "this version of cvc5 with different versions of these libraries\n"
             "follow the instructions on "
-            "https://github.com/cvc5/cvc5/blob/master/INSTALL.md\n\n";
+            "https://github.com/cvc5/cvc5/blob/main/INSTALL.md\n\n";
     }
   }
 

diff --git a/src/proof/proof_rule.h b/src/proof/proof_rule.h
index 546f966b98529e713b1a1ebb35c325e136d63ff9..e4cac4bf0bf557bf7b312b7d9305a28e80026108 100644 (file)
--- a/src/proof/proof_rule.h
+++ b/src/proof/proof_rule.h
@@ -27,7 +27,7 @@ namespace cvc5::internal {
  * An enumeration for proof rules. This enumeration is analogous to Kind for
  * Node objects.
  * This documentation is target for the online documentation that can be found
- * at https://cvc5.github.io/docs/master/proofs/proof_rules.html.
+ * at https://cvc5.github.io/docs/main/proofs/proof_rules.html.
  *
  * All proof rules are given as inference rules, presented in the following
  * form:

diff --git a/test/regress/cli/README.md b/test/regress/cli/README.md
index 34330fa151c6286f7f32d0ff5cc393902f047e1d..020b9819b5ba8139fbaf3cc5e843720011f11bc8 100644 (file)
--- a/test/regress/cli/README.md
+++ b/test/regress/cli/README.md
@@ -17,7 +17,7 @@ The time limits for each level are:
 ## Running Regression Tests
 
 For running regressions tests, see the
-[INSTALL](https://github.com/cvc5/cvc5/blob/master/INSTALL.rst#testing-cvc5)
+[INSTALL](https://github.com/cvc5/cvc5/blob/main/INSTALL.rst#testing-cvc5)
 file.
 
 By default, each invocation of cvc5 is done with a 10 minute timeout. To use a