mirror/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2026-05-12 18:07:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

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(
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"
)
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}'"