Rename default branch from master to main
This commit is contained in:
committed by
Frédéric Guillot
parent
ce6c4dfc67
commit
b433519686
@@ -19,7 +19,7 @@ class Version
|
||||
*/
|
||||
public static function isCompatible($pluginCompatibleVersion, $appVersion = APP_VERSION)
|
||||
{
|
||||
if (strpos($appVersion, 'master') !== false) {
|
||||
if (strpos($appVersion, 'master') !== false || strpos($appVersion, 'main') !== false) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -197,12 +197,12 @@ function build_app_version($ref, $commit_hash)
|
||||
}
|
||||
|
||||
if ($commit_hash !== '$Format:%H$') {
|
||||
return 'master.'.$commit_hash;
|
||||
return 'main.'.$commit_hash;
|
||||
} else if (file_exists('/version.txt')) {
|
||||
return rtrim(file_get_contents('/version.txt'));
|
||||
}
|
||||
|
||||
return 'master.unknown_revision';
|
||||
return 'main.unknown_revision';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user