Skip to content

Conversation

@richard67
Copy link
Member

@richard67 richard67 commented Jun 8, 2024

Pull Request for Issue # .

Summary of Changes

This pull request (PR) sets the version to "6.0.0-alpha1-dev" using the build/bump.php script.

Currently without this PR the version in the "files/joomla.xml" manifest is "5.2.0-alpha1-dev" from the last upmerge.

Therefore you currently cannot use "Upload & Update" for updating a current 5.2-dev build to a current 6.0-dev update package because that would be a downgrade from 5.2.0-alpha2-dev to 5.2.0-alpha1-dev regarding the version in the manifest XML file before the update and in the update package, which is checked by the updater and is rejected.

Furthermore you get an error in the database checker about not matching CMS version because the version in the "libraries/src/Version.php" file was set to "6.0.0-alpha-dev" with PR #42969 , but the manifest was not changed with that PR.

This PR here fixes that.

I had first changed only the version in the manifest file, but I was asked to make a complete version bump by other maintainers.

This PR does not change the code name in the "libraries/src/Version.php" file. That name is still the same as for 5.2.

The 6.0 release managers will have to use build/bump.php script again when they have decided for a code name for 6.0.

Testing Instructions

Code review should be sufficient.

But if you want to make a real test:

Try to update a recent 5.2.0-alpha2-dev nightly build to a recent 6.0 nightly build using the "Upload & Update" button at the bottom of the Joomla Update view.

Result: The update is refused because it would be a downgrade according to the versions from the manifest files of the current installation and the one in the update package.

Now try to update to the update package created by Drone for this PR, also with the "Upload & Update" button.

Result: The captive login is shown, and if you enter the right user name and password the update would be started.

Actual result BEFORE applying this Pull Request

You can not update a recent 5.2.0-alpha2-dev nightly build to a recent 6.0 nightly build using the "Upload & Update" method because that reports that the update would be a downgrade to 5.2.0-alpha1-dev.

Expected result AFTER applying this Pull Request

You can update a recent 5.2 nightly build to a 6.0 nightly build.

Link to documentations

Please select:

  • No documentation changes for docs.joomla.org needed

  • No documentation changes for manual.joomla.org needed

@brianteeman
Copy link
Contributor

I have tested this item ✅ successfully on 7651b9e


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/43634.

@richard67
Copy link
Member Author

I will update this PR soon (today or tomorrow) so it does a complete version bump. Stay tuned.

@richard67 richard67 requested a review from laoneo as a code owner June 9, 2024 08:20
@joomla-cms-bot joomla-cms-bot added the Language Change This is for Translators label Jun 9, 2024
@richard67 richard67 changed the title [6.0] Init version in files/joomla.xml manifest for 6.0 [6.0] Set version to 6.0.0-alpha1-dev Jun 9, 2024
@richard67
Copy link
Member Author

Done.

@brianteeman
Copy link
Contributor

This PR does not change the code name in the "libraries/src/Version.php" file. That name is still the same as for 5.2.

Can this not be done in this PR. Otherwise it will just need another PR to bump the name and its not really a complete PR for setting the version without it.

(otherwise it all looks good to me)

@richard67
Copy link
Member Author

@brianteeman As far as I know release managers will decide for a code name but their working phase has not started yet and they haven't decided yet for a code name as far as I know. Otherwise, if I knew the new code name I would of course do that with my PR.

@brianteeman
Copy link
Contributor

Understood and I'm not even sure if the constant CODENAME is ever referenced/displayed/used but just in case then my preference would be to change it now (even to something temporary such as "RENAME_ME_6") so that it is a different unique name

@wilsonge wilsonge merged commit 9badb82 into joomla:6.0-dev Jun 12, 2024
@wilsonge
Copy link
Contributor

Code name can be done later - it's just at whim - hence we got lumped with unicorn ages ago :D And that can be used for the release managers to understand how to use bump

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

Labels

Language Change This is for Translators PR-6.0-dev

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants