diff --git a/application/front/controller/admin/ServerController.php b/application/front/controller/admin/ServerController.php index 4b74f4a9..9be5ea77 100644 --- a/application/front/controller/admin/ServerController.php +++ b/application/front/controller/admin/ServerController.php @@ -28,7 +28,7 @@ class ServerController extends ShaarliAdminController $releaseUrl = ApplicationUtils::$GITHUB_URL . '/releases/'; if ($this->container->conf->get('updates.check_updates', true)) { $latestVersion = 'v' . ApplicationUtils::getVersion( - ApplicationUtils::$GIT_RAW_URL . '/latest/' . ApplicationUtils::$VERSION_FILE + ApplicationUtils::$GIT_RAW_URL . '/release/' . ApplicationUtils::$VERSION_FILE ); $releaseUrl .= 'tag/' . $latestVersion; } else { diff --git a/application/legacy/LegacyUpdater.php b/application/legacy/LegacyUpdater.php index 9bda54b8..d457c543 100644 --- a/application/legacy/LegacyUpdater.php +++ b/application/legacy/LegacyUpdater.php @@ -438,7 +438,7 @@ class LegacyUpdater // Get latest branch major version digit $latestVersion = ApplicationUtils::getLatestGitVersionCode( - 'https://raw.githubusercontent.com/shaarli/Shaarli/latest/shaarli_version.php', + 'https://raw.githubusercontent.com/shaarli/Shaarli/release/shaarli_version.php', 5 ); if (preg_match('/(\d+)\.\d+$/', $latestVersion, $matches) === false) { diff --git a/doc/md/dev/Release-Shaarli.md b/doc/md/dev/Release-Shaarli.md index 9440c2fb..c56654c9 100644 --- a/doc/md/dev/Release-Shaarli.md +++ b/doc/md/dev/Release-Shaarli.md @@ -139,16 +139,16 @@ make release_archive This will create `shaarli-v0.x.y-full.tar`, `shaarli-v0.x.y-full.zip`. These archives need to be manually uploaded on the previously created GitHub [release](https://github.com/shaarli/Shaarli/releases). -### Update the `latest` branch +### Update the `release` branch ```bash -# checkout the 'latest' branch -git checkout latest +# checkout the 'release' branch +git checkout release # merge changes from your newly published release branch git merge v0.x.y # fix eventual conflicts with git mergetool... # run tests make test # push the latest branch -git push upstream latest +git push upstream release ```