Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1960 from nodiscc/doc-updte-release-branch

Browse source 
doc: update release procedure (merge the latest release to the release branch) + use the release branch for latest release version detection
This commit is contained in:
nodiscc 2023-03-20 17:23:34 +00:00 committed by GitHub
parent 6624f00c05 625235787e
commit 9c9d6298bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/front/controller/admin/ServerController.php
View file

@ -28,7 +28,7 @@ class ServerController extends ShaarliAdminController
$releaseUrl = ApplicationUtils::$GITHUB_URL . '/releases/'; $releaseUrl = ApplicationUtils::$GITHUB_URL . '/releases/';
if ($this->container->conf->get('updates.check_updates', true)) { if ($this->container->conf->get('updates.check_updates', true)) {
$latestVersion = 'v' . ApplicationUtils::getVersion( $latestVersion = 'v' . ApplicationUtils::getVersion(
ApplicationUtils::$GIT_RAW_URL . '/latest/' . ApplicationUtils::$VERSION_FILE ApplicationUtils::$GIT_RAW_URL . '/release/' . ApplicationUtils::$VERSION_FILE
); );
$releaseUrl .= 'tag/' . $latestVersion; $releaseUrl .= 'tag/' . $latestVersion;
} else { } else {

2
application/legacy/LegacyUpdater.php
View file

@ -438,7 +438,7 @@ class LegacyUpdater
// Get latest branch major version digit // Get latest branch major version digit
$latestVersion = ApplicationUtils::getLatestGitVersionCode( $latestVersion = ApplicationUtils::getLatestGitVersionCode(
'https://raw.githubusercontent.com/shaarli/Shaarli/latest/shaarli_version.php', 'https://raw.githubusercontent.com/shaarli/Shaarli/release/shaarli_version.php',
5 5
); );
if (preg_match('/(\d+)\.\d+$/', $latestVersion, $matches) === false) { if (preg_match('/(\d+)\.\d+$/', $latestVersion, $matches) === false) {

8
doc/md/dev/Release-Shaarli.md
View file

@ -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). 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 ```bash
# checkout the 'latest' branch # checkout the 'release' branch
git checkout latest git checkout release
# merge changes from your newly published release branch # merge changes from your newly published release branch
git merge v0.x.y git merge v0.x.y
# fix eventual conflicts with git mergetool... # fix eventual conflicts with git mergetool...
# run tests # run tests
make test make test
# push the latest branch # push the latest branch
git push upstream latest git push upstream release
``` ```