Merge branch 'master-to-main' into 'main'
ci: Rename master to main branch See merge request pwithnall/malcontent!121
This commit is contained in:
commit
a22a8fdaf3
|
@ -60,7 +60,7 @@ debian:
|
||||||
pages:
|
pages:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
only:
|
only:
|
||||||
- master
|
- main
|
||||||
script:
|
script:
|
||||||
- mv _coverage/ public/
|
- mv _coverage/ public/
|
||||||
artifacts:
|
artifacts:
|
||||||
|
|
|
@ -24,7 +24,7 @@ aparser.add_argument('--job-id', metavar='ID',
|
||||||
default='Unknown')
|
default='Unknown')
|
||||||
aparser.add_argument('--branch', metavar='NAME',
|
aparser.add_argument('--branch', metavar='NAME',
|
||||||
help='Branch of the project being tested',
|
help='Branch of the project being tested',
|
||||||
default='master')
|
default='main')
|
||||||
aparser.add_argument('--output', metavar='FILE',
|
aparser.add_argument('--output', metavar='FILE',
|
||||||
help='The output file, stdout by default',
|
help='The output file, stdout by default',
|
||||||
type=argparse.FileType('w', encoding='UTF-8'),
|
type=argparse.FileType('w', encoding='UTF-8'),
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
</description>
|
</description>
|
||||||
<screenshots>
|
<screenshots>
|
||||||
<screenshot height="552" width="699" type="default">
|
<screenshot height="552" width="699" type="default">
|
||||||
<image>https://gitlab.freedesktop.org/pwithnall/malcontent/-/raw/master/malcontent-control/malcontent-control.png</image>
|
<image>https://gitlab.freedesktop.org/pwithnall/malcontent/-/raw/HEAD/malcontent-control/malcontent-control.png</image>
|
||||||
<caption>Main window</caption>
|
<caption>Main window</caption>
|
||||||
</screenshot>
|
</screenshot>
|
||||||
</screenshots>
|
</screenshots>
|
||||||
|
|
Loading…
Reference in New Issue