Update references to master in the repository

.gitlab-ci/flatpak-build.sh

@@ -43,6 +43,6 @@ flatpak build-bundle \
         ${appid}
 
 # to be consumed by the nightly publish jobs
-if [[ $CI_COMMIT_BRANCH == master ]]; then
+if [[ $CI_COMMIT_BRANCH == main ]]; then
         tar cf repo.tar ${repodir}
 fi

.gitlab-ci/meson-html-report.py

@@ -268,7 +268,7 @@ aparser.add_argument('--job-id', metavar='ID',
                      default=None)
 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 HTML file, stdout by default',
                      type=argparse.FileType('w', encoding='UTF-8'),

.gitlab-ci/meson-junit-report.py

@@ -27,7 +27,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'),

.gitlab-ci/run-style-check-diff.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-# We need to add a new remote for the upstream master, since this script could
+# We need to add a new remote for the upstream main, since this script could
 # be running in a personal fork of the repository which has out of date branches.
 if [ "${CI_PROJECT_NAMESPACE}" != "GNOME" ]; then
     echo "Retrieving the current upstream repository from ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}..."
@@ -16,7 +16,7 @@ fi
 
 # Work out the newest common ancestor between the detached HEAD that this CI job
 # has checked out, and the upstream target branch (which will typically be
-# `upstream/master` or `upstream/gtk-3-24`).
+# `upstream/main` or `upstream/gtk-3-24`).
 #
 # `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
 # a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
@@ -36,7 +36,7 @@ exit_status=$?
 echo ""
 echo "Note that clang-format output is advisory and cannot always match the"
 echo "GTK coding style, documented at:"
-echo "   https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
+echo "   https://gitlab.gnome.org/GNOME/gtk/blob/main/docs/CODING-STYLE"
 echo "Warnings from this tool can be ignored in favour of the documented "
 echo "coding style, or in favour of matching the style of existing"
 echo "surrounding code."