Rename master branch to main

Author: NWilson

.github/workflows/build.yml

@@ -20,9 +20,9 @@ on:
         - distcheck
         - coverage
   push:
-    branches: [ master, "release/**" ]
+    branches: [ main, "release/**" ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 permissions:
   contents: read

.github/workflows/cifuzz.yml

@@ -2,7 +2,7 @@ name: CIFuzz
 on:
   workflow_dispatch:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 permissions:
   contents: read

.github/workflows/clang-analyzer.yml

@@ -2,9 +2,9 @@ name: Clang Static Analyzer
 on:
   workflow_dispatch:
   push:
-    branches: [ master, "release/**" ]
+    branches: [ main, "release/**" ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 permissions:
   contents: read

.github/workflows/codeql.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, "release/**" ]
+    branches: [ main, "release/**" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '27 6 * * 4'
 

.github/workflows/pages.yml

@@ -5,7 +5,7 @@ on:
     workflows: [ 'Sync' ]
     types:
       - completed
-    branches: [ master ]
+    branches: [ main ]
   push:
     branches: [ pages ]
   pull_request:

.github/workflows/scorecards.yml

@@ -6,7 +6,7 @@ on:
   schedule:
     - cron: '23 17 * * 1'
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 permissions: read-all
 

.github/workflows/sync.yml

@@ -2,9 +2,9 @@ name: Sync
 on:
   workflow_dispatch:
   push:
-    branches: [ master, "release/**" ]
+    branches: [ main, "release/**" ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 permissions:
   contents: read
@@ -72,9 +72,9 @@ jobs:
           fi
 
   sync-docs:
-    name: Sync content from master to pages
+    name: Sync content from main to pages
     runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
+    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
     needs: ['sync-autogenerated']
     permissions:
       contents: write
@@ -83,19 +83,19 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: false
-          fetch-depth: 0 # Necessary to get both the master and pages branches
+          fetch-depth: 0 # Necessary to get both the main and pages branches
           fetch-tags: false
           ref: pages
 
       - name: Commit and push, if docs have changed
         run: |
-          if ! git diff --exit-code origin/master -- \
+          if ! git diff --exit-code origin/main -- \
                ./doc ./AUTHORS.md ./LICENCE.md ./SECURITY.md ./README.md \
                ./README ./NON-AUTOTOOLS-BUILD >/dev/null ; then
-            # Differences from master: merge and push
+            # Differences from main: merge and push
             git config user.name "github-actions[bot]"
             git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-            git merge origin/master --no-edit -m"Sync content from master to pages"
+            git merge origin/main --no-edit -m"Sync content from main to pages"
             git push
           else
             echo "No content changes to sync"

README.md

@@ -32,7 +32,7 @@ https://pcre2project.github.io/pcre2/
 <td>
 
 [![GitHub Release](https://img.shields.io/github/v/release/PCRE2Project/pcre2?display_name=release&style=flat-square&label=Latest%20release&color=006094)](https://github.com/PCRE2Project/pcre2/releases)&nbsp;
-[![BSD licence](https://img.shields.io/badge/Licence-BSD%203--clause-006094?style=flat-square)](https://github.com/PCRE2Project/pcre2/blob/master/LICENCE.md)
+[![BSD licence](https://img.shields.io/badge/Licence-BSD%203--clause-006094?style=flat-square)](https://github.com/PCRE2Project/pcre2/blob/main/LICENCE.md)
 
 </tr>
 </tr>

maint/README

@@ -211,7 +211,7 @@ Preparing for a PCRE2 release
 This section contains a checklist of things that I (NCW) do before building a
 new release.
 
-* First of all, make sure that the master branch is in good condition.
+* First of all, make sure that the main branch is in good condition.
 
   - Basically, test it. The CI jobs should all be passing. This ensures that
     pcre2tests are passing, that the build is warning-free, and that all our
@@ -266,12 +266,12 @@ new release.
 * Add the new library version to the src/libpcre2-*.sym files (even if no new
   symbols have been added since the last release).
 
-* Push all these changes to master.
+* Push all these changes to main.
 
-* Take a branch off master, named "release/pcre2-10.XX-RC1" or
+* Take a branch off main, named "release/pcre2-10.XX-RC1" or
   "release/pcre2-10.XX".
 
-  All releases should come from master. The final release isn't branched off
+  All releases should come from main. The final release isn't branched off
   from the RC branch; the RC branch is a "throwaway" release which can be pruned
   from the linear history of the trunk of PCRE2's tree.
 
@@ -346,9 +346,9 @@ new release.
 
 * Announce the release on the mailing list.
 
-* Bump the version number on master to the next release, plus -DEV.
+* Bump the version number on main to the next release, plus -DEV.
 
-* After issuing a final release, merge the release tag back to master with:
+* After issuing a final release, merge the release tag back to main with:
 
   ```
   git merge -s ours release/pcre2-10.XX
@@ -359,7 +359,7 @@ new release.
 
   We want users with forks of PCRE2 to be able to update from release to the
   next by simply doing a `git merge` in their fork. If the release tag is not
-  merged back to master, then users will see unnecessary Git conflicts when
+  merged back to main, then users will see unnecessary Git conflicts when
   trying to fast-forward from one release to the next.