From 4a9b69a7208f0ffab0a0491d02655a4fbbad232a Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Wed, 20 Sep 2023 14:46:23 +0000 Subject: [PATCH 1/2] Lint 'main' too --- fdroidserver/lint.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py index 7a042a70..9e009160 100644 --- a/fdroidserver/lint.py +++ b/fdroidserver/lint.py @@ -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}'" From 4d0117d54c113f5ce0c266df7d248f73e987d026 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Thu, 21 Sep 2023 07:31:54 +0000 Subject: [PATCH 2/2] fix lint --- fdroidserver/lint.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py index 9e009160..951c74fd 100644 --- a/fdroidserver/lint.py +++ b/fdroidserver/lint.py @@ -141,7 +141,9 @@ http_checks = ( re.compile( 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 or /main to point at a file in the default branch" + ), ), ] )