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.0] Delete 4.x update SQL scripts from last upmerge and add them to deleted files list in script.php #40372

Conversation

richard67
Copy link
Member

@richard67 richard67 commented Apr 12, 2023

Pull Request for Issue # .

Summary of Changes

With the last upmerge from 4.4-dev there have been again added new 4.x update SQL scripts to the 5.0-dev branch.

These files should not be merged up.

This PR here fixes that by deleting the files and adding them to the list of deleted files in script.php so they are deleted when updating from 4.x like it is done with the other 4.x update SQL scripts.

Currently there are no other changes to be done on the deleted files and folders lists in script.php in the 5.0-dev branch.

Testing Instructions

Code review.

Or if you want to make a real test, update the last 4.4 nightly build to the last 5.0 nightly build to get the actual result, and update the last 4.4 nightly build to the update package built by Drone for this PR to get the expected result.

Actual result BEFORE applying this Pull Request

There are two 4.3.0 update SQL scripts present for each kind of database after updating from the last 4.4 nightly build.

Expected result AFTER applying this Pull Request

There are no 4.x update SQL scripts present after updating from the last 4.4 nightly build.

Link to documentations

Please select:

  • No documentation changes for docs.joomla.org needed

  • No documentation changes for manual.joomla.org needed

@richard67
Copy link
Member Author

Ping @HLeithner . Question: Would it help to add the patterns administrator/components/com_admin/sql/updates/mysql/4.*.sql and administrator/components/com_admin/sql/updates/postgresql/4.*.sql to the .gitignore file so that any 4.x update SQL script would be ignored and also not included in builds? If yes and we add that, it would mean we have to change the .gitignore file with every new major version.

@HLeithner
Copy link
Member

Ping @HLeithner . Question: Would it help to add the patterns administrator/components/com_admin/sql/updates/mysql/4.*.sql and administrator/components/com_admin/sql/updates/postgresql/4.*.sql to the .gitignore file so that any 4.x update SQL script would be ignored and also not included in builds? If yes and we add that, it would mean we have to change the .gitignore file with every new major version.

I think it's better to keep it as it is, because we need to delete the files in this script file anyway. Maybe a notice/warning/error in the build script could make sense.

@HLeithner HLeithner merged commit a7d4f18 into joomla:5.0-dev Apr 12, 2023
@richard67 richard67 deleted the 5.0-dev-deleted-files-and-folders_2023-04-12 branch April 12, 2023 12:34
richard67 added a commit to richard67/joomla-cms that referenced this pull request May 1, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request May 22, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request May 29, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 3, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 8, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 8, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 23, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 23, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jun 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 3, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 3, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 22, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 22, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 23, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 23, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Jul 24, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Aug 12, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Aug 12, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Aug 19, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Aug 19, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 1, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 1, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 4, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 5, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 5, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 14, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 14, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 19, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 19, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Sep 26, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Oct 1, 2023
richard67 added a commit to richard67/joomla-cms that referenced this pull request Oct 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants