diff --git a/action.yml b/action.yml index 1605355c..ec336476 100644 --- a/action.yml +++ b/action.yml @@ -112,21 +112,13 @@ runs: fi id: base-sha shell: bash - - run: | - bash $GITHUB_ACTION_PATH/sourcefiles.sh - id: source-input-files - shell: bash - env: - # INPUT_ 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@v3.3 + uses: tj-actions/glob@v5 id: glob with: - files: ${{ steps.source-input-files.outputs.files }} + files: ${{ inputs.files }} files-separator: " " + files-from-source-file: ${{ inputs.files_from_source_file }} separator: "|" - run: | bash $GITHUB_ACTION_PATH/entrypoint.sh diff --git a/sourcefiles.sh b/sourcefiles.sh deleted file mode 100644 index 7b965753..00000000 --- a/sourcefiles.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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}')" - -ALL_FILES=("${CLEAN_FILES[@]}" "${CLEAN_INPUT_FILES[@]}") - -echo "Input files: ${ALL_FILES[*]}" - -echo "::set-output name=files::${ALL_FILES[*]}" - -echo "::endgroup::"