Skip to content

Conversation

@richard67
Copy link
Member

@richard67 richard67 commented Jul 22, 2023

Pull Request for #41065 (comment) .

Summary of Changes

This Pull Request (PR) fixes a mistake in the build/deleted_file_check.php script which I've made with my recently merged PR #41065 :

The files administrator/language/en-GB/plg_task_demotasks.ini and administrator/language/en-GB/plg_task_demotasks.sys.ini should be excluded from the list of deleted files, but that doesn't work because I've added them at the wrong place.

Testing Instructions

  1. On a clean, current 5.0-dev branch (no need for having run composer or npm and no need for a Joomla installation), download the following 2 Joomla 5.0 Alpha 1 and 2 full packages and save them in the tmp folder:
  1. Unzip the packages in the tmp folder into 2 separate folders Joomla_5.0.0-alpha1-Alpha-Full_Package and Joomla_5.0.0-alpha2-Alpha-Full_Package.
  2. In a command windows in the directory with your git clone and the branch from step 1, run the following command to check the two folders from the previous step for deleted files and folders (on Windows you have to use backslashes \ instead of slashes / for the paths):
php ./build/deleted_file_check.php --from=./tmp/Joomla_5.0.0-alpha1-Alpha-Full_Package --to=./tmp/Joomla_5.0.0-alpha2-Alpha-Full_Package
  1. Check the 2 created text files ./build/deleted_files.txt and ./build/deleted_folders.txt.
    Result: See section "Actual result BEFORE applying this Pull Request" below.
  2. Save the 2 text files from step 4 for later comparison.
  3. Apply the changes from this PR.
  4. Repeat steps 3 and 4 and compare the 2 text files with those saved in step 5.
    Result: See section "Expected result AFTER applying this Pull Request" below.

Actual result BEFORE applying this Pull Request

File ./build/deleted_files.txt still contains 2 rows '/administrator/language/en-GB/plg_task_demotasks.ini', and '/administrator/language/en-GB/plg_task_demotasks.sys.ini',.

File ./build/deleted_folders.txt is empty.

Expected result AFTER applying this Pull Request

File ./build/deleted_files.txt doesn't contain '/administrator/language/en-GB/plg_task_demotasks.ini', and '/administrator/language/en-GB/plg_task_demotasks.sys.ini',.

Besides that, it doesn't differ to the file saved in step 5 without this PR applied.

File ./build/deleted_folders.txt is empty, same as without this PR.

Link to documentations

Please select:

  • No documentation changes for docs.joomla.org needed

  • No documentation changes for manual.joomla.org needed

@HLeithner HLeithner merged commit 3177246 into joomla:5.0-dev Jul 22, 2023
@HLeithner
Copy link
Member

thanks

@richard67 richard67 deleted the 5.0-dev-fix-deleted-file-check-excluded-files-from-pr-41065 branch July 22, 2023 12:32
GeraintEdwards pushed a commit to GeraintEdwards/joomla-cms that referenced this pull request Aug 14, 2023
GeraintEdwards pushed a commit to GeraintEdwards/joomla-cms that referenced this pull request Aug 14, 2023
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.

3 participants