mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lint 'main' too

Browse source
This commit is contained in:
Licaon_Kter 2023-09-20 14:46:23 +00:00 • committed by Hans-Christoph Steiner
parent aaf58826c0
commit 4a9b69a720
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/lint.py
View file

@ -139,9 +139,9 @@ http_checks = (
), ),
( (
re.compile( 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 to point at a file in the default branch"), _("Use /HEAD instead of /master or /main to point at a file in the default branch"),
), ),
] ]
) )
@ -464,7 +464,7 @@ def check_builds(app):
"Build generated by `fdroid import` - remove disable line once ready" "Build generated by `fdroid import` - remove disable line once ready"
) )
continue 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): if build.commit and build.commit.startswith(s):
yield _( yield _(
"Branch '{branch}' used as commit in build '{versionName}'" "Branch '{branch}' used as commit in build '{versionName}'"