From de353089de610c3d1d451809c2bc762975266964 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 17 Sep 2021 12:39:17 +0100 Subject: [PATCH] ci: Rename master to main branch Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 2 +- .gitlab-ci/meson-junit-report.py | 2 +- .../org.freedesktop.MalcontentControl.appdata.xml.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fb4f97..0736f96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ debian: pages: stage: deploy only: - - master + - main script: - mv _coverage/ public/ artifacts: diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py index 90939ff..8d8ccad 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/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml.in b/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml.in index 383cec2..91eb1aa 100644 --- a/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml.in +++ b/malcontent-control/org.freedesktop.MalcontentControl.appdata.xml.in @@ -21,7 +21,7 @@ - https://gitlab.freedesktop.org/pwithnall/malcontent/-/raw/master/malcontent-control/malcontent-control.png + https://gitlab.freedesktop.org/pwithnall/malcontent/-/raw/HEAD/malcontent-control/malcontent-control.png Main window