Updated separator

2022-02-16 22:59:14 -05:00
8 changed files with 72 additions and 105 deletions
--- a/.github/workflows/sync-release-version.yml
+++ b/.github/workflows/sync-release-version.yml
@@ -23,7 +23,7 @@ jobs:
        with:
          output: 'HISTORY.md'
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.12.1
+        uses: peter-evans/create-pull-request@v3.12.0
        with:
          base: "main"
          title: "Upgraded to ${{ steps.sync-release-version.outputs.new_version }}"
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -615,7 +615,7 @@ jobs:
        if: steps.changed-files-specific-only-changed.outputs.other_deleted_files != ''
        run: |
          if [[ "${{ steps.changed-files-specific-only-changed.outputs.only_deleted }}" != "false" ]]; then
-            echo "Invalid output: Expected (false) got (${{ steps.changed-files-specific-only-changed.outputs.only_deleted }})."
+            echo "Invalid output: Expected (false) got (${{ steps.changed-files-specific-only-changed.outputs.only_deleted }})"
            exit 1
          fi
        shell:
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -31,7 +31,7 @@ jobs:

      - name: Create Pull Request
        if: failure()
-        uses: peter-evans/create-pull-request@v3.12.1
+        uses: peter-evans/create-pull-request@v3
        with:
          base: "main"
          title: "Updated README.md"
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,67 +1,5 @@
 # Changelog

-## [v4.0.3](https://github.com/tj-actions/changed-files/tree/v4.0.3) (2022-02-02)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v14.2...v4.0.3)
-
-**Fixed bugs:**
-
- \[BUG\] Action flips forward slash into backslash resulting in match failure.  [\#340](https://github.com/tj-actions/changed-files/issues/340)
- \[BUG\] Getting Error: `uses:` keyword is not currently supported when using above 12.2 version [\#333](https://github.com/tj-actions/changed-files/issues/333)
- \[BUG\] Investigate possible bug using since\_last\_remote\_commit when force pushing changes. [\#303](https://github.com/tj-actions/changed-files/issues/303)
-
-**Merged pull requests:**
-
- fix: resolve bug with pattern matching on windows [\#341](https://github.com/tj-actions/changed-files/pull/341) ([jackton1](https://github.com/jackton1))
- Upgraded to v14.2 [\#339](https://github.com/tj-actions/changed-files/pull/339) ([jackton1](https://github.com/jackton1))
-
-## [v14.2](https://github.com/tj-actions/changed-files/tree/v14.2) (2022-02-01)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v4.0.2...v14.2)
-
-**Fixed bugs:**
-
- \[BUG\] Negating filter doesn't work [\#335](https://github.com/tj-actions/changed-files/issues/335)
-
-**Merged pull requests:**
-
- Upgraded to v4.0.2 [\#338](https://github.com/tj-actions/changed-files/pull/338) ([jackton1](https://github.com/jackton1))
-
-## [v4.0.2](https://github.com/tj-actions/changed-files/tree/v4.0.2) (2022-02-01)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v14.1...v4.0.2)
-
-**Merged pull requests:**
-
- bug: resolve issue with excluding files via glob pattern [\#337](https://github.com/tj-actions/changed-files/pull/337) ([jackton1](https://github.com/jackton1))
- Bump peter-evans/create-pull-request from 3.12.0 to 3.12.1 [\#334](https://github.com/tj-actions/changed-files/pull/334) ([dependabot[bot]](https://github.com/apps/dependabot))
- Upgraded to v14.1 [\#332](https://github.com/tj-actions/changed-files/pull/332) ([jackton1](https://github.com/jackton1))
-
-## [v14.1](https://github.com/tj-actions/changed-files/tree/v14.1) (2022-01-26)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v4.0.1...v14.1)
-
-**Merged pull requests:**
-
- Upgraded to v4.0.1 [\#331](https://github.com/tj-actions/changed-files/pull/331) ([jackton1](https://github.com/jackton1))
-
-## [v4.0.1](https://github.com/tj-actions/changed-files/tree/v4.0.1) (2022-01-26)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v14...v4.0.1)
-
-**Merged pull requests:**
-
- bug: Fix command to narrow down target files [\#330](https://github.com/tj-actions/changed-files/pull/330) ([massongit](https://github.com/massongit))
- Upgraded to v14 [\#329](https://github.com/tj-actions/changed-files/pull/329) ([jackton1](https://github.com/jackton1))
-
-## [v14](https://github.com/tj-actions/changed-files/tree/v14) (2022-01-26)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v4.0.0...v14)
-
-**Merged pull requests:**
-
- Upgraded to v4.0.0 [\#328](https://github.com/tj-actions/changed-files/pull/328) ([jackton1](https://github.com/jackton1))
-
 ## [v4.0.0](https://github.com/tj-actions/changed-files/tree/v4.0.0) (2022-01-26)

 [Full Changelog](https://github.com/tj-actions/changed-files/compare/v13.2...v4.0.0)
@@ -82,7 +20,7 @@

 ## [v3.0.2](https://github.com/tj-actions/changed-files/tree/v3.0.2) (2022-01-25)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v13.1...v3.0.2)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v3.0.1...v3.0.2)

 **Fixed bugs:**

@@ -100,13 +38,13 @@
 - Upgraded to v13.1 [\#316](https://github.com/tj-actions/changed-files/pull/316) ([jackton1](https://github.com/jackton1))
 - Upgraded to v3.0.1 [\#315](https://github.com/tj-actions/changed-files/pull/315) ([jackton1](https://github.com/jackton1))

-## [v13.1](https://github.com/tj-actions/changed-files/tree/v13.1) (2022-01-09)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v3.0.1...v13.1)
-
 ## [v3.0.1](https://github.com/tj-actions/changed-files/tree/v3.0.1) (2022-01-09)

-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v3.0.0...v3.0.1)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v13.1...v3.0.1)
+
+## [v13.1](https://github.com/tj-actions/changed-files/tree/v13.1) (2022-01-09)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v3.0.0...v13.1)

 **Closed issues:**

--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4a625e9b62794b5b98e169c15c0e673c)](https://www.codacy.com/gh/tj-actions/changed-files/dashboard?utm_source=github.com\&utm_medium=referral\&utm_content=tj-actions/changed-files\&utm_campaign=Badge_Grade)
-[![CI](https://github.com/tj-actions/changed-files/actions/workflows/test.yml/badge.svg)](https://github.com/tj-actions/changed-files/actions/workflows/test.yml) [![Update release version.](https://github.com/tj-actions/changed-files/actions/workflows/sync-release-version.yml/badge.svg)](https://github.com/tj-actions/changed-files/actions/workflows/sync-release-version.yml) [![Public workflows that use this action.](https://img.shields.io/endpoint?url=https%3A%2F%2Fused-by.vercel.app%2Fapi%2Fgithub-actions%2Fused-by%3Faction%3Dtj-actions%2Fchanged-files%26badge%3Dtrue)](https://github.com/search?o=desc\&q=tj-actions+changed-files+language%3AYAML\&s=\&type=Code)
+[![CI](https://github.com/tj-actions/changed-files/actions/workflows/test.yml/badge.svg)](https://github.com/tj-actions/changed-files/actions/workflows/test.yml) [![Update release version.](https://github.com/tj-actions/changed-files/actions/workflows/sync-release-version.yml/badge.svg)](https://github.com/tj-actions/changed-files/actions/workflows/sync-release-version.yml) [![Public workflows that use this action.](https://img.shields.io/endpoint?url=https%3A%2F%2Fapi-tj-actions1.vercel.app%2Fapi%2Fgithub-actions%2Fused-by%3Faction%3Dtj-actions%2Fchanged-files%26badge%3Dtrue)](https://github.com/search?o=desc\&q=tj-actions+changed-files+language%3AYAML\&s=\&type=Code)

 [![Ubuntu](https://img.shields.io/badge/Ubuntu-E95420?logo=ubuntu\&logoColor=white)](https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on)
 [![Mac OS](https://img.shields.io/badge/mac%20os-000000?logo=macos\&logoColor=F0F0F0)](https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on)
@@ -64,7 +64,7 @@ jobs:

      - name: Get changed files
        id: changed-files
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0

      - name: List all changed files
        run: |
@@ -141,11 +141,11 @@ Support this project with a :star:

      - name: Get changed files using defaults
        id: changed-files
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0

      - name: Get changed files using a comma separator
        id: changed-files-comma
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0
        with:
          separator: ","

@@ -167,7 +167,7 @@ Support this project with a :star:

      - name: Get specific changed files
        id: changed-files-specific
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0
        with:
          files: |
            my-file.txt
@@ -206,14 +206,14 @@ Support this project with a :star:

      - name: Use a source file or list of file(s) to populate to files input.
        id: changed-files-specific-source-file
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0
        with:
          files_from_source_file: |
            test/changed-files-list.txt

      - name: Use a source file or list of file(s) to populate to files input and optionally specify more files.
        id: changed-files-specific-source-file-and-specify-files
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0
        with:
          files_from_source_file: |
            test/changed-files-list.txt
@@ -222,13 +222,13 @@ Support this project with a :star:

      - name: Use a different commit SHA
        id: changed-files-custom-sha
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0
        with:
          sha: ${{ github.event.pull_request.head.sha }}

      - name: Use a different base SHA
        id: changed-files-custom-base-sha
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0
        with:
          base_sha: "2096ed0"
          
@@ -240,7 +240,7 @@ Support this project with a :star:

      - name: Run changed-files with defaults on the dir1
        id: changed-files-for-dir1
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0
        with:
          path: dir1

@@ -252,7 +252,7 @@ Support this project with a :star:

      - name: Run changed-files using the last commit on the remote branch
        id: changed-files-since-last-remote-commit
-        uses: tj-actions/changed-files@v4.0.3
+        uses: tj-actions/changed-files@v4.0.0
        with:
          since_last_remote_commit: "true"

@@ -270,14 +270,6 @@ Support this project with a :star:
 > *   However, this action will handle spaces in file names, with a recommendation of using a separator to prevent hidden issues.
 >     ![Screen Shot 2021-10-23 at 9 37 34 AM](https://user-images.githubusercontent.com/17484350/138558767-b13c90bf-a1ae-4e86-9520-70a6a4624f41.png)

-## Compatibility
-
-|  Runner                  |   Supported version   |
-|--------------------------|-----------------------|
-| [GitHub-hosted runners](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners)    |     `v14.2`           |
-| [GitHub Enterprise Server](https://docs.github.com/en/enterprise-server@3.3/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server) | `v14.2` |
-| [self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners)      |  `v12.2` & `v2.0.1`  |
-
 ## Credits

 This package was created with [Cookiecutter](https://github.com/cookiecutter/cookiecutter).
--- a/action.yml
+++ b/action.yml
@@ -112,13 +112,21 @@ runs:
        fi
      id: base-sha
      shell: bash
+    - run: |
+        bash $GITHUB_ACTION_PATH/sourcefiles.sh
+      id: source-input-files
+      shell: bash
+      env:
+        # INPUT_<VARIABLE_NAME> is not available in Composite run steps
+        # https://github.community/t/input-variable-name-is-not-available-in-composite-run-steps/127611
+        INPUT_FILES: ${{ inputs.files }}
+        INPUT_FILES_FROM_SOURCE_FILE: ${{ inputs.files_from_source_file }}
    - name: Glob match
-      uses: tj-actions/glob@v6
+      uses: tj-actions/glob@v3.3
      id: glob
      with:
-        files: ${{ inputs.files }}
+        files: ${{ steps.source-input-files.outputs.files }}
        files-separator: " "
-        files-from-source-file: ${{ inputs.files_from_source_file }}
        separator: "|"
    - run: |
        bash $GITHUB_ACTION_PATH/entrypoint.sh
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -107,19 +107,18 @@ if [[ -z "$INPUT_FILES_PATTERN" ]]; then
  ALL_MODIFIED=$(git diff --diff-filter="ACMRD" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | awk -v d="$INPUT_SEPARATOR" '{s=(NR==1?s:s d)$0}END{print s}')
 else
  echo "Input files pattern: $INPUT_FILES_PATTERN"
-  FILES_PATTERN="^($INPUT_FILES_PATTERN)$"

-  ADDED=$(git diff --diff-filter=A --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  COPIED=$(git diff --diff-filter=C --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  DELETED=$(git diff --diff-filter=D --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  MODIFIED=$(git diff --diff-filter=M --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  RENAMED=$(git diff --diff-filter=R --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  TYPE_CHANGED=$(git diff --diff-filter=T --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  UNMERGED=$(git diff --diff-filter=U --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  UNKNOWN=$(git diff --diff-filter=X --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  ALL_CHANGED_AND_MODIFIED=$(git diff --diff-filter="*ACDMRTUX" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  ALL_CHANGED=$(git diff --diff-filter="ACMR" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
-  ALL_MODIFIED=$(git diff --diff-filter="ACMRD" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -E "$FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  ADDED=$(git diff --diff-filter=A --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  COPIED=$(git diff --diff-filter=C --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  DELETED=$(git diff --diff-filter=D --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  MODIFIED=$(git diff --diff-filter=M --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  RENAMED=$(git diff --diff-filter=R --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  TYPE_CHANGED=$(git diff --diff-filter=T --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  UNMERGED=$(git diff --diff-filter=U --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  UNKNOWN=$(git diff --diff-filter=X --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  ALL_CHANGED_AND_MODIFIED=$(git diff --diff-filter="*ACDMRTUX" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  ALL_CHANGED=$(git diff --diff-filter="ACMR" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')
+  ALL_MODIFIED=$(git diff --diff-filter="ACMRD" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | grep -x "$INPUT_FILES_PATTERN" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}')

  ALL_OTHER_CHANGED=$(git diff --diff-filter="ACMR" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | 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}')
--- a/sourcefiles.sh
+++ b/sourcefiles.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "::group::changed-files-from-source-file"
+
+RAW_FILES=()
+
+if [[ -n $INPUT_FILES_FROM_SOURCE_FILE ]]; then
+  for file in $INPUT_FILES_FROM_SOURCE_FILE
+  do
+    while read -r fileName; do
+      RAW_FILES+=("$fileName")
+    done <"$file"
+  done
+fi
+
+IFS=" " read -r -a CLEAN_FILES <<< "$(echo "${RAW_FILES[*]}" | tr "\r\n" "\n" | tr " " "\n" | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')"
+
+IFS=" " read -r -a CLEAN_INPUT_FILES <<< "$(echo "${INPUT_FILES}" | tr "\r\n" "\n" | tr " " "\n" | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')"
+
+FILES=("${CLEAN_FILES[@]}" "${CLEAN_INPUT_FILES[@]}")
+
+IFS=" " read -r -a ALL_UNIQUE_FILES <<< "$(echo "${FILES[@]}" | tr "\r\n" "\n" | tr " " "\n" | awk '!a[$0]++' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')"
+
+echo "Input files: ${ALL_UNIQUE_FILES[*]}"
+
+echo "::set-output name=files::${ALL_UNIQUE_FILES[*]}"
+
+echo "::endgroup::"