[6.0] Add exceptions to deleted files check for files from PR #44321#44912
Merged
Bodge-IT merged 3 commits intojoomla:6.0-devfrom Mar 3, 2025
Merged
Conversation
4 tasks
Member
Author
|
Hmm, there is something wrong. I have to check. Setting to draft in the mean time. |
Member
Author
|
Silly me, it was my testing instruction which was wrong. I've told to compare a 5.2-dev with a 5.3-dev package, but it should have been comparing a 5.3-dev with a 6.0-dev package. Fixed it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull Request for #44321 (comment) .
Summary of Changes
This pull request (PR) adds 2 folders to the list of folders not to be checked in the
build/deleted_file_check.phpscript which is used to check if there are deleted files or folders to be added to theadministrator/components/com_admin/script.phpfile.The added folders belong to media files which were removed from the sources with PR #44321 but shall not be removed when updating, see #44321 (comment) .
Testing Instructions
The tests require PHP CLI so you can run PHP scripts on a command line, and it requires to be run on Linux or on Windows with WSL or on Mac OS. On Windows without WSL it does not work right. I will provide a fix for that sooner or later with another PR.
It is a stand-alone script and sop can be used even without the CMS.
tmpfolder of your Git clone and the package file names as folder names:./build/deleted_files.txtand./build/deleted_folders.txt.Result: See section "Actual result BEFORE applying this Pull Request" below.
Result: See section "Expected result AFTER applying this Pull Request" below.
Actual result BEFORE applying this Pull Request
File
./build/deleted_files.txtincludes the following files:File
./build/deleted_folders.txtincludes the following folders:Besides this, there might be other files and folders in these text files which are not relevant for this PR here.
Expected result AFTER applying this Pull Request
Files
./build/deleted_files.txtand./build/deleted_folders.txtdo NOT include the files and folders mentioned in the previous section "Actual result BEFORE applying this Pull Request".Link to documentations
Please select:
Documentation link for docs.joomla.org:
No documentation changes for docs.joomla.org needed
Pull Request link for manual.joomla.org:
No documentation changes for manual.joomla.org needed