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

5.1 inclusion into minor #337

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Conversation

obuisard
Copy link
Contributor

No description provided.

Modified to include 5.1
Modified to include 5.1
@zero-24
Copy link
Contributor

zero-24 commented Oct 19, 2023

I would say we should also allow updates from 4.4-dev and 5.0-dev to 5.1-dev right?

@HLeithner
Copy link
Member

can we directly restructure this into understandable directories and file names please

Include 4.4 in update to 5.1
@obuisard
Copy link
Contributor Author

can we directly restructure this into understandable directories and file names please

You mean like you did with next.xml for instance? Maybe should be done in a separate PR.

@HLeithner
Copy link
Member

splitting first makes more sense, to make it clear what should happen

@obuisard
Copy link
Contributor Author

splitting first makes more sense, to make it clear what should happen

I have split the files. I was able to spot a few mistakes (at least, I thought they were mistakes...).
I hope this is what you were looking for.

@HLeithner
Copy link
Member

are your spotted mistakes related to 4.0.4 and lower versions?

@obuisard
Copy link
Contributor Author

are your spotted mistakes related to 4.0.4 and lower versions?

In list_test:

<extension name="Joomla" element="joomla" type="file" version="4.4.0-rc" targetplatformversion="3.10.12" detailsurl="https://update.joomla.org/core/test/extension_test.xml" />
	<extension name="Joomla" element="joomla" type="file" version="4.4.0-rc" targetplatformversion="3.10.13" detailsurl="https://update.joomla.org/core/test/extension_test.xml" />

did not seem right to me because nothing mentioned in extension_test.xml

@obuisard
Copy link
Contributor Author

I also make sure 4.0.4 is treated differently:

<extension name="Joomla" element="joomla" type="file" version="4.0.4" targetplatformversion="4.0" detailsurl="https://update.joomla.org/core/j4/default.xml" />

goes to the default.xml file rather that patch.xml for instance, because we always need to install it first on 4.0 systems before anything else.

Comment on lines -22 to -98
<update>
<name>Joomla! 4.0</name>
<description>Joomla! 4.0 CMS</description>
<element>joomla</element>
<type>file</type>
<version>4.0.4</version>
<infourl title="Joomla 4.0.4 Release">https://www.joomla.org/announcements/release-news/5849-joomla-4-0-4-and-joomla-3-10-3-are-here.html</infourl>
<downloads>
<downloadurl type="full" format="zip">https://downloads.joomla.org/cms/joomla4/4-0-4/Joomla_4.0.4-Stable-Update_Package.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
</tags>
<supported_databases mysql="5.6" mariadb="10.1" postgresql="11.0" />
<php_minimum>7.2.5</php_minimum>
<maintainer>Joomla! Production Department</maintainer>
<maintainerurl>https://www.joomla.org</maintainerurl>
<section>STS</section>
<targetplatform name="joomla" version="4.0" />
</update>
<update>
<name>Joomla! 4.4 Nightly Build</name>
<description>Joomla! CMS</description>
<element>joomla</element>
<type>file</type>
<version>4.4.1-dev</version>
<infourl title="Joomla! Nightly Builds">https://developer.joomla.org/nightly-builds.html</infourl>
<downloads>
<downloadurl type="full" format="zip">https://developer.joomla.org/nightlies/Joomla_4.4.1-dev-Development-Update_Package.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
</tags>
<supported_databases mysql="5.6" mariadb="10.1" postgresql="11.0" />
<php_minimum>7.2.5</php_minimum>
<maintainer>Joomla! Production Department</maintainer>
<maintainerurl>https://www.joomla.org</maintainerurl>
<targetplatform name="joomla" version="4.0.[456]" />
</update>
<update>
<name>Joomla! 4.4 Nightly Build</name>
<description>Joomla! CMS</description>
<element>joomla</element>
<type>file</type>
<version>4.4.1-dev</version>
<infourl title="Joomla! Nightly Builds">https://developer.joomla.org/nightly-builds.html</infourl>
<downloads>
<downloadurl type="full" format="zip">https://developer.joomla.org/nightlies/Joomla_4.4.1-dev-Development-Update_Package.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
</tags>
<supported_databases mysql="5.6" mariadb="10.1" postgresql="11.0" />
<php_minimum>7.2.5</php_minimum>
<maintainer>Joomla! Production Department</maintainer>
<maintainerurl>https://www.joomla.org</maintainerurl>
<targetplatform name="joomla" version="4.[1234]" />
</update>
<update>
<name>Joomla! 5.0 Nightly Build</name>
<description>Joomla! CMS</description>
<element>joomla</element>
<type>file</type>
<version>5.0.1-dev</version>
<infourl title="Joomla! Nightly Builds">https://developer.joomla.org/nightly-builds.html</infourl>
<downloads>
<downloadurl type="full" format="zip">https://developer.joomla.org/nightlies/Joomla_5.0.1-dev-Development-Update_Package.zip</downloadurl>
</downloads>
<tags>
<tag>stable</tag>
</tags>
<supported_databases mysql="8.0.13" mariadb="10.4" postgresql="12.0" />
<php_minimum>8.1.0</php_minimum>
<maintainer>Joomla! Production Department</maintainer>
<maintainerurl>https://www.joomla.org</maintainerurl>
<targetplatform name="joomla" version="5.[0]" />
</update>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you removed the special handling for 4.0.x series at least I'm not sure what you are doing with it?

did you changed it to j4/default.xml?

Copy link
Contributor Author

@obuisard obuisard Oct 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, all handling of 4.0 is done in j4/default.xml

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

Successfully merging this pull request may close these issues.

None yet

3 participants