From 08f351ba1617550c70bdca44cc29a166152e2bd4 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Tue, 31 Jan 2023 17:38:55 -0700 Subject: [PATCH] feat: add support for excluding the top level directory (#967) --- .github/workflows/test.yml | 22 ++++++++++++++++++++++ action.yml | 5 +++++ get-changed-paths.sh | 4 ++++ 3 files changed, 31 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b9123fb6..ba49ca30 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -446,6 +446,28 @@ jobs: exit 1 shell: bash + - name: Run changed-files with dir_names and dir_names_exclude_root + id: changed-files-dir-names-exclude-root + uses: ./ + with: + base_sha: dddfbd69 + sha: ce8c1983 + fetch_depth: 60000 + dir_names: "true" + dir_names_exclude_root: "true" + dir_names_max_depth: "1" + - name: Show output + run: | + echo '${{ toJSON(steps.changed-files-dir-names-exclude-root.outputs) }}' + shell: + bash + - name: Check dir_names output + if: steps.changed-files-dir-names-exclude-root.outputs.all_changed_files != '.github' + run: | + echo "Invalid output: Expected (.github) got (${{ steps.changed-files-dir-names-exclude-root.outputs.all_changed_files }})" + exit 1 + shell: + bash - name: Run changed-files with dir_names id: changed-files-dir-names uses: ./ diff --git a/action.yml b/action.yml index 85dc803c..ec1a4c15 100644 --- a/action.yml +++ b/action.yml @@ -75,6 +75,10 @@ inputs: dir_names_max_depth: description: "Maximum depth of directories to output. e.g `test/test1/test2` with max depth of `2` returns `test/test1`." required: false + dir_names_exclude_root: + description: "Exclude the root directory represented by `.` from the output when `dir_names`is set to `true`." + required: false + default: "false" json: description: "Output list of changed files in a JSON formatted string which can be used for matrix jobs." required: false @@ -245,6 +249,7 @@ runs: INPUT_DIFF_RELATIVE: ${{ inputs.diff_relative }} INPUT_DIR_NAMES: ${{ inputs.dir_names }} INPUT_DIR_NAMES_MAX_DEPTH: ${{ inputs.dir_names_max_depth }} + INPUT_DIR_NAMES_EXCLUDE_ROOT: ${{ inputs.dir_names_exclude_root }} INPUT_JSON: ${{ inputs.json }} INPUT_HAS_CUSTOM_PATTERNS: ${{ steps.glob.outputs.has-custom-patterns }} INPUT_JSON_RAW_FORMAT: ${{ inputs.json_raw_format }} diff --git a/get-changed-paths.sh b/get-changed-paths.sh index 363d6576..5cf7fd2f 100755 --- a/get-changed-paths.sh +++ b/get-changed-paths.sh @@ -47,6 +47,10 @@ function get_dirname_max_depth() { depth=$((depth + 1)) done + if [[ "$INPUT_DIR_NAMES_EXCLUDE_ROOT" == "true" && "$output" == "." ]]; then + continue + fi + echo "$output" done < <(uniq) }