Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all references to the stable branch #1964

Closed
nodiscc opened this issue Mar 24, 2023 · 1 comment · Fixed by #2042
Closed

Remove all references to the stable branch #1964

nodiscc opened this issue Mar 24, 2023 · 1 comment · Fixed by #2042
Assignees
Milestone

Comments

@nodiscc
Copy link
Member

nodiscc commented Mar 24, 2023

Since v0.12.2, the stable Docker tag has been removed, but the stable branch is still present and referred to in various places. Users who want to consume the latest release should now use the release branch, which is considered stable and well tested.

All references to the stable branch should be removed and replaced with release, ideally preserving an automatic upgrade path for users who are still use it.

~/GIT/Shaarli (master=)$ git grep stable
README.md:[![](https://img.shields.io/badge/stable-v0.11.1-blue.svg)](https://github.com/shaarli/Shaarli/releases/tag/v0.11.1)
[...]
application/helper/ApplicationUtils.php:    public static $GIT_BRANCHES = ['latest', 'stable'];
application/helper/ApplicationUtils.php:        $branch = 'stable'
[...]
application/legacy/LegacyUpdater.php:            $branch = 'stable';
[...]
doc/md/Docker.md:- `stable` and `master`: **deprecated**. These tags are no longer maintained and may be removed without notice
[...]
doc/md/Shaarli-configuration.md:        "check_updates_branch": "stable",
doc/md/Shaarli-configuration.md:        "check_updates_branch": "stable",
doc/md/Shaarli-configuration.md:- **check_updates_branch**: Git branch used to check updates (e.g. `stable` or `master`).
[...]
doc/md/Upgrade-and-migration.md: * [new branch]      stable     -> origin/stable
doc/md/Upgrade-and-migration.md:### Step 2: use the stable community branch
doc/md/Upgrade-and-migration.md:$ git checkout origin/stable -b stable
doc/md/Upgrade-and-migration.md:Branch stable set up to track remote branch stable from origin.
doc/md/Upgrade-and-migration.md:Switched to a new branch 'stable'
doc/md/Upgrade-and-migration.md:* stable 890afc3 [origin/stable] Merge pull request #509 from ArthurHoaro/v0.6.5
[...]
tests/utils/config/configJson.json.php:        "check_updates_branch": "stable",

I can see the stable branch is still used as a reference in LegacyUpdater.php so we might have to keep it until the next release/update it one last time.

@nodiscc nodiscc added this to the 0.13.0 milestone Mar 24, 2023
@nodiscc nodiscc self-assigned this Nov 15, 2023
@nodiscc nodiscc modified the milestones: 0.13.0, 0.14.0 Nov 22, 2023
ArthurHoaro added a commit to ArthurHoaro/Shaarli that referenced this issue Nov 22, 2023
@ArthurHoaro
Copy link
Member

I can see the stable branch is still used as a reference in LegacyUpdater.php so we might have to keep it until the next release/update it one last time.

Unless it triggers a real error, LegacyUpdate should not be updated. The change included in this function will be overridden by another Updater method removing that setting.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants