Revert "feat: Added support for returning old and new names of renamed files" (#485)

.github/workflows/test.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - "**"
   pull_request:
     branches:
       - main
@@ -294,42 +293,6 @@ jobs:
           echo '${{ toJSON(steps.changed-files-specific-newline-source-file.outputs) }}'
         shell:
           bash
-      - name: Run changed-files for old new filenames test rename 1
-        id: changed-files-all-old-new-renamed-files-1
-        uses: ./
-        with:
-          base_sha: d1c0ee4
-          sha: 4d04215
-      - name: Show output
-        run: |
-          echo '${{ toJSON(steps.changed-files-all-old-new-renamed-files-1.outputs) }}'
-        shell:
-          bash
-      - name: Check all_old_new_renamed_files output
-        if: "!contains(steps.changed-files-all-old-new-renamed-files-1.outputs.all_old_new_renamed_files, 'test/test rename 1.txt,test/test rename-1.txt')"
-        run: |
-          echo "Invalid output: Expected to include (test/test rename 1.txt,test/test rename-1.txt) got (${{ steps.changed-files-all-old-new-renamed-files-1.outputs.all_old_new_renamed_files }})"
-          exit 1
-        shell:
-          bash
-      - name: Run changed-files for old new filenames test rename 2
-        id: changed-files-all-old-new-renamed-files-2
-        uses: ./
-        with:
-          base_sha: 4d04215
-          sha: fe238e6
-      - name: Show output
-        run: |
-          echo '${{ toJSON(steps.changed-files-all-old-new-renamed-files-2.outputs) }}'
-        shell:
-          bash
-      - name: Check all_old_new_renamed_files output
-        if: "!contains(steps.changed-files-all-old-new-renamed-files-2.outputs.all_old_new_renamed_files, 'test/test rename 2.txt,test/test rename-2.txt')"
-        run: |
-          echo "Invalid output: Expected to include (test/test rename 2.txt test/test rename-2.txt) got (${{ steps.changed-files-all-old-new-renamed-files-2.outputs.all_old_new_renamed_files }})"
-          exit 1
-        shell:
-          bash
       - name: Run changed-files with specific files
         id: changed-files-specific
         uses: ./

README.md

@@ -101,7 +101,7 @@ Support this project with a :star:
 |     X     |   Unknown    |
 
 |               Output               |   type   |             example              |                                                                                                      description                                                                                                      |
-|:----------------------------------:|:--------:|:--------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+|:----------------------------------:|:--------:|:--------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
 |            any\_changed            | `string` |        `true` OR `false`         |         Returns `true` when any <br /> of the filenames provided using <br /> the `files` input has changed. <br /> i.e. *using a combination of all added, <br />copied, modified and renamed files (ACMR)*          |
 |           only\_changed            | `string` |        `true` OR `false`         |                                                           Returns `true` when only <br /> files provided using <br /> the `files` input has changed. (ACMR)                                                           |
 |       other\_changed\_files        | `string` | `'new.txt path/to/file.png ...'` |                                 Select all other changed files <br/> not listed in the files input <br /> i.e. *a  combination of all added, <br /> copied and modified files (ACMR)*                                 |
@@ -119,7 +119,6 @@ Support this project with a :star:
 |           deleted\_files           | `string` | `'new.txt path/to/file.png ...'` |                                                                                        Select only files that are Deleted (D)                                                                                         |
 |          modified\_files           | `string` | `'new.txt path/to/file.png ...'` |                                                                                        Select only files that are Modified (M)                                                                                        |
 |           renamed\_files           | `string` | `'new.txt path/to/file.png ...'` |                                                                                        Select only files that are Renamed (R)                                                                                         |
-|     all_old_new_renamed_files      | `string` | `'old name.txt,new name.txt old name 2.txt,new name 2.txt...'` |                                                                        Select only files that are Renamed and list their old and new names (R)                                                                        |
 |        type\_changed\_files        | `string` | `'new.txt path/to/file.png ...'` |                                                                                Select only files that have their file type changed (T)                                                                                |
 |          unmerged\_files           | `string` | `'new.txt path/to/file.png ...'` |                                                                                        Select only files that are Unmerged (U)                                                                                        |
 |           unknown\_files           | `string` | `'new.txt path/to/file.png ...'` |                                                                                        Select only files that are Unknown (X)                                                                                         |
@@ -129,9 +128,7 @@ Support this project with a :star:
 |               Input               |          type          | required |        default        |                                                                                                                                                          description                                                                                                                                                          |
 |:---------------------------------:|:----------------------:|:--------:|:---------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
 |               token               |        `string`        | `false`  | `${{ github.token }}` | [GITHUB\_TOKEN](https://docs.github.com/en/free-pro-team@latest/actions/reference/authentication-in-a-workflow#using-the-github_token-in-a-workflow) <br /> or a repo scoped <br /> [Personal Access Token](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token) |
-|             separator             |        `string`        | `false`  |         `' '`         |                                                                                                                                              Split character for output strings                                                                                                                                               |
+|             separator             |        `string`        |  `true`  |         `' '`         |                                                                                                                                                    Output string separator                                                                                                                                                    |
-|        old\_new\_separator        |        `string`        | `false`  |         `','`         |                                                                                                                                        Split character for old and new filename pairs                                                                                                                                         |
-|    old\_new\_files\_separator     |        `string`        | `false`  |         `' '`         |                                                                                                                                    Split character for multiple old and new filename pairs                                                                                                                                    |
 |               files               | `string` OR `string[]` | `false`  |                       |                                                                                                             Check for changes  <br> using only these <br> list of file(s) <br> (Defaults to the <br> entire repo)                                                                                                             |
 |         files\_separator          |         string         | `false`  |        `'\n'`         |                                                                                                                                         Separator used to split the<br>`files` input                                                                                                                                          |
 |     files\_from\_source\_file     |        `string`        | `false`  |                       |                                                                                                                                  Source file(s) <br> used to populate <br> the `files` input                                                                                                                                  |

action.yml

@@ -5,19 +5,11 @@ author: tj-actions
 inputs:
   token:
     description: 'Github token'
-    required: false
+    required: true
     default: ${{ github.token }}
   separator:
-    description: 'Split character for output strings'
+    description: 'Split character for array output'
-    required: false
+    required: true
-    default: " "
-  old_new_separator:
-    description: 'Split character for old and new filename pairs'
-    required: false
-    default: ","
-  old_new_files_separator:
-    description: 'Split character for multiple old and new filename pairs'
-    required: false
     default: " "
   files_from_source_file:
     description: 'Source file(s) to populate the files input'
@@ -82,9 +74,6 @@ outputs:
   renamed_files:
     description: List of renamed files.
     value: ${{ steps.changed-files.outputs.renamed_files }}
-  all_old_new_renamed_files:
-    description: List of all old and new names of renamed files.
-    value: ${{ steps.changed-files.outputs.all_old_new_renamed_files }}
   type_changed_files:
     description: List of files that had type changes.
     value: ${{ steps.changed-files.outputs.type_changed_files }}
@@ -193,8 +182,6 @@ runs:
         INPUT_TARGET_BRANCH: ${{ steps.changed-files-diff-sha.outputs.target_branch }}
         INPUT_CURRENT_BRANCH: ${{ steps.changed-files-diff-sha.outputs.current_branch }}
         INPUT_QUOTEPATH: ${{ inputs.quotepath }}
-        INPUT_OLD_NEW_SEPARATOR: ${{ inputs.old_new_separator }}
-        INPUT_OLD_NEW_FILES_SEPARATOR: ${{ inputs.old_new_files_separator }}
 
 branding:
   icon: file-text

entrypoint.sh

@@ -78,7 +78,6 @@ if [[ -z "$INPUT_FILES_PATTERN_FILE" ]]; then
   ALL_CHANGED_AND_MODIFIED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" "*ACDMRTUX" | awk -v d="$INPUT_SEPARATOR" '{s=(NR==1?s:s d)$0}END{print s}')
   ALL_CHANGED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" "ACMR" | awk -v d="$INPUT_SEPARATOR" '{s=(NR==1?s:s d)$0}END{print s}')
   ALL_MODIFIED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" "ACMRD" | awk -v d="$INPUT_SEPARATOR" '{s=(NR==1?s:s d)$0}END{print s}')
-  ALL_OLD_NEW_RENAMED_FILES=$(get_renames "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" | awk -v d="$INPUT_OLD_NEW_FILES_SEPARATOR" '{s=(NR==1?s:s d)$0}END{print s}')
 else
   ADDED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" A | grep -x -E -f "$INPUT_FILES_PATTERN_FILE" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
   COPIED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" C | grep -x -E -f "$INPUT_FILES_PATTERN_FILE" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
@@ -91,7 +90,6 @@ else
   ALL_CHANGED_AND_MODIFIED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" "*ACDMRTUX" | grep -x -E -f "$INPUT_FILES_PATTERN_FILE" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
   ALL_CHANGED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" "ACMR" | grep -x -E -f "$INPUT_FILES_PATTERN_FILE" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
   ALL_MODIFIED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" "ACMRD" | grep -x -E -f "$INPUT_FILES_PATTERN_FILE" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  ALL_OLD_NEW_RENAMED_FILES=$(get_renames "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" | grep -x -E -f "$INPUT_FILES_PATTERN_FILE" | awk -v d="$INPUT_OLD_NEW_FILES_SEPARATOR" '{s=(NR==1?s:s d)$0}END{print s}')
 
   ALL_OTHER_CHANGED=$(get_diff "$INPUT_PREVIOUS_SHA" "$INPUT_CURRENT_SHA" "ACMR" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
   UNIQUE_ALL_CHANGED=$(echo "${ALL_CHANGED}" | awk '{gsub(/\|/,"\n"); print $0;}' | awk '!a[$0]++' | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
@@ -209,7 +207,6 @@ echo "Unknown files: $UNKNOWN"
 echo "All changed and modified files: $ALL_CHANGED_AND_MODIFIED"
 echo "All changed files: $ALL_CHANGED"
 echo "All modified files: $ALL_MODIFIED"
-echo "All old & new renamed files: $ALL_OLD_NEW_RENAMED_FILES"
 
 echo "::set-output name=added_files::$ADDED"
 echo "::set-output name=copied_files::$COPIED"
@@ -222,6 +219,5 @@ echo "::set-output name=unknown_files::$UNKNOWN"
 echo "::set-output name=all_changed_and_modified_files::$ALL_CHANGED_AND_MODIFIED"
 echo "::set-output name=all_changed_files::$ALL_CHANGED"
 echo "::set-output name=all_modified_files::$ALL_MODIFIED"
-echo "::set-output name=all_old_new_renamed_files::$ALL_OLD_NEW_RENAMED_FILES"
 
 echo "::endgroup::"

test/test rename 1.txt

@@ -1 +0,0 @@
-This is a test file.

test/test rename 2.txt

@@ -1 +0,0 @@
-This is a test file.