summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-07-16 12:31:24 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-07-17 08:23:52 -0400
commitdac2f408531df6bb589e5128be95b6cfb7494b07 (patch)
tree7eac1ea56b3cf8680b29de2bb0b6ce2508e8c12f
parenta22fdc1476e7ef6e380d733227f879e312563f4a (diff)
downloadpango-dac2f408531df6bb589e5128be95b6cfb7494b07.tar.gz
ci: Update branch references to main
Change ci to point at the main branch instead of master. This is part of #579
-rw-r--r--.gitlab-ci.yml2
-rwxr-xr-x.gitlab-ci/meson-junit-report.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfe5f790..3b9f5200 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,4 +140,4 @@ pages:
paths:
- public
only:
- - master
+ - main
diff --git a/.gitlab-ci/meson-junit-report.py b/.gitlab-ci/meson-junit-report.py
index fc96efba..aaa3f45a 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'),