From f56e736bedd192c12951db94e83a440885d04eb1 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Wed, 29 Dec 2021 19:57:35 -0500 Subject: [PATCH] Fixed regression bug with other_modified and other_changed outputs (#294) --- entrypoint.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index dba6a4a3..2a6da836 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -126,8 +126,6 @@ else 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;}' | sort -u | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}') - UNIQUE_ALL_CHANGED=$(echo "${UNIQUE_ALL_CHANGED}" | awk '{gsub(/\|/,"\n"); print $0;}' | awk -v d="$INPUT_SEPARATOR" '{s=(NR==1?s:s d)$0}END{print s}') - if [[ -n "${UNIQUE_ALL_CHANGED}" ]]; then echo "Matching changed files: ${UNIQUE_ALL_CHANGED}" echo "::set-output name=any_changed::true" @@ -156,8 +154,6 @@ else ALL_OTHER_MODIFIED=$(git diff --diff-filter="ACMRD" --name-only "$PREVIOUS_SHA" "$CURRENT_SHA" | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}') UNIQUE_ALL_MODIFIED=$(echo "${ALL_MODIFIED}" | awk '{gsub(/\|/,"\n"); print $0;}' | sort -u | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}') - UNIQUE_ALL_MODIFIED=$(echo "${UNIQUE_ALL_MODIFIED}" | awk '{gsub(/\|/,"\n"); print $0;}' | awk -v d="$INPUT_SEPARATOR" '{s=(NR==1?s:s d)$0}END{print s}') - if [[ -n "${UNIQUE_ALL_MODIFIED}" ]]; then echo "Matching modified files: ${UNIQUE_ALL_MODIFIED}" echo "::set-output name=any_modified::true" @@ -195,7 +191,7 @@ else if [[ -n $ALL_OTHER_DELETED ]]; then if [[ -n "$UNIQUE_ALL_DELETED" ]]; then - OTHER_DELETED=$(echo "${ALL_OTHER_DELETED}|${UNIQUE_ALL_DELETED}" | awk '{gsub(/\|/,"\n"); print $0;}' | sort | uniq -u | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}') + OTHER_DELETED=$(echo "${ALL_OTHER_DELETED}|${UNIQUE_ALL_DELETED}" | awk '{gsub(/\|/,"\n"); print $0;}' | sort | uniq -u | awk -v d="|" '{s=(NR==1?s:s d)$0}END{print s}') else OTHER_DELETED=$ALL_OTHER_DELETED fi