mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-08-17 11:50:11 +02:00
Merge branch 'licaon-kter-master-patch-70325' into 'master'
Lint 'main' too as it gains popularity See merge request fdroid/fdroidserver!1392
This commit is contained in:
commit
b5724f507b
@ -139,9 +139,11 @@ http_checks = (
|
||||
),
|
||||
(
|
||||
re.compile(
|
||||
r'^https://[^/]*(github|gitlab|bitbucket|rawgit|githubusercontent)\.[a-zA-Z]+/([^/]+/){2,3}master/'
|
||||
r'^https://[^/]*(github|gitlab|bitbucket|rawgit|githubusercontent)\.[a-zA-Z]+/([^/]+/){2,3}(master|main)/'
|
||||
),
|
||||
_(
|
||||
"Use /HEAD instead of /master or /main to point at a file in the default branch"
|
||||
),
|
||||
_("Use /HEAD instead of /master to point at a file in the default branch"),
|
||||
),
|
||||
]
|
||||
)
|
||||
@ -464,7 +466,7 @@ def check_builds(app):
|
||||
"Build generated by `fdroid import` - remove disable line once ready"
|
||||
)
|
||||
continue
|
||||
for s in ['master', 'origin', 'HEAD', 'default', 'trunk']:
|
||||
for s in ['master', 'main', 'origin', 'HEAD', 'default', 'trunk']:
|
||||
if build.commit and build.commit.startswith(s):
|
||||
yield _(
|
||||
"Branch '{branch}' used as commit in build '{versionName}'"
|
||||
|
Loading…
Reference in New Issue
Block a user