[gnome-software: 2/3] ci: Rename default branch to ‘main’

[Philip Withnall <pwithnall src gnome org>]

commit 0987c0a6ac9e19475be4367d2f34c5cabacceee0
Author: Philip Withnall <pwithnall endlessos org>
Date:   Wed Jul 14 10:23:58 2021 +0100

    ci: Rename default branch to ‘main’
    
    See https://gitlab.gnome.org/GNOME/glib/-/issues/2348 for background.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>
    
    Fixes: #1318

 .gitlab-ci.yml                   |  2 +-
 .gitlab-ci/meson-junit-report.py |  2 +-
 README.md                        | 15 ++++++++++++++-
 RELEASE.md                       |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3323dae83..5cec9a04a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,7 +96,7 @@ flatpak bundle:
     - tar cf repo.tar repo/
 
 # Due to the `only` clause in .publish_nightly, this will only publish on-demand
-# builds to nightly.gnome.org if they are built from a commit on `master`
+# builds to nightly.gnome.org if they are built from a commit on `main`
 nightly:
   extends: '.publish_nightly'
   dependencies:
diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py
index 9b772cbb3..8bb7667dd 100755
--- a/.gitlab-ci/meson-junit-report.py
+++ b/.gitlab-ci/meson-junit-report.py
@@ -24,7 +24,7 @@ aparser.add_argument('--job-id', metavar='ID',
                      default='Unknown')
 aparser.add_argument('--branch', metavar='NAME',
                      help='Branch of the project being tested',
-                     default='master')
+                     default='main')
 aparser.add_argument('--output', metavar='FILE',
                      help='The output file, stdout by default',
                      type=argparse.FileType('w', encoding='UTF-8'),
diff --git a/README.md b/README.md
index c181688ea..15ab528b3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build 
Status](https://gitlab.gnome.org/GNOME/gnome-software/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/gnome-software/pipelines)
+[![Build 
Status](https://gitlab.gnome.org/GNOME/gnome-software/badges/main/pipeline.svg)](https://gitlab.gnome.org/GNOME/gnome-software/pipelines)
 
 # Software
 
@@ -65,6 +65,19 @@ $ XDG_DATA_DIRS=install/share:$XDG_DATA_DIRS LD_LIBRARY_PATH=install/lib64/:$LD_
 $ XDG_DATA_DIRS=install/share:$XDG_DATA_DIRS LD_LIBRARY_PATH=install/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH 
./install/bin/gnome-software
 ```
 
+## Default branch renamed to `main`
+
+The default development branch of gnome-software has been renamed to `main`. To
+update your local checkout, use:
+```sh
+git checkout master
+git branch -m master main
+git fetch
+git branch --unset-upstream
+git branch -u origin/main
+git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
+```
+
 # Debugging
 
 Running with `--verbose` will give detailed logging information.
diff --git a/RELEASE.md b/RELEASE.md
index b4ce6f11d..f310962a8 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -16,7 +16,7 @@ Adapted from the [GNOME release process](https://wiki.gnome.org/MaintainersCorne
 These instructions use the following variables:
  - `new_version`: the version number of the release you are making, for example 3.38.1
  - `previous_version`: the version number of the most-recently released version in the same release series, 
for example 3.38.0
- - `branch`: the branch which the release is based on, for example gnome-40 or master
+ - `branch`: the branch which the release is based on, for example gnome-40 or main
  - `key_id`: the ID of your GPG key, see the output of `gpg --list-keys` and the note at the end of this file
 
 Make sure your repository is up to date and doesn’t contain local changes: