From 768bd71134ce746c128215558ac49d5c0443d072 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Wed, 14 May 2025 15:00:44 -0400 Subject: [PATCH 1/4] Revert "Fix read error" This reverts commit 9eec59b1faaa77b3be193084485fc7de65eb2aa0. --- .github/workflows/scripts/check-license-header.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/check-license-header.sh b/.github/workflows/scripts/check-license-header.sh index de9f55f8..49f9e2f9 100755 --- a/.github/workflows/scripts/check-license-header.sh +++ b/.github/workflows/scripts/check-license-header.sh @@ -46,7 +46,7 @@ dynamic_exclude_list=( ) if [[ -f .licenseignore ]]; then static_exclude_list+=( '":(exclude).licenseignore"' ) - IFS=$'\n' read -r -a dynamic_exclude_list <<< "$(sed -E 's/^(.*)$/":(exclude)\1"/' <.licenseignore)" + IFS=$'\n' read -d '' -r -a dynamic_exclude_list <<< "$(sed -E 's/^(.*)$/":(exclude)\1"/' <.licenseignore)" fi exclude_list=( "${static_exclude_list[@]}" "${dynamic_exclude_list[@]}" ) From a7b6e71cf87106273e23d1e9c1f85c80b1873d0b Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Wed, 14 May 2025 15:00:52 -0400 Subject: [PATCH 2/4] Revert "Fix shellcheck error" This reverts commit 2811d950daac42d3c802f6a3e122b5b942511b01. --- .github/workflows/scripts/check-license-header.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/check-license-header.sh b/.github/workflows/scripts/check-license-header.sh index 49f9e2f9..0ee65dff 100755 --- a/.github/workflows/scripts/check-license-header.sh +++ b/.github/workflows/scripts/check-license-header.sh @@ -46,7 +46,7 @@ dynamic_exclude_list=( ) if [[ -f .licenseignore ]]; then static_exclude_list+=( '":(exclude).licenseignore"' ) - IFS=$'\n' read -d '' -r -a dynamic_exclude_list <<< "$(sed -E 's/^(.*)$/":(exclude)\1"/' <.licenseignore)" + IFS=$'\n' read -d '' -r -a dynamic_exclude_list <<< $(sed -E 's/^(.*)$/":(exclude)\1"/' <.licenseignore) fi exclude_list=( "${static_exclude_list[@]}" "${dynamic_exclude_list[@]}" ) From ddda1f26a0648df5013c9ce5025e31300236fd06 Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Wed, 14 May 2025 15:01:04 -0400 Subject: [PATCH 3/4] Revert "Split out static, and dynamic exclude lists" This reverts commit 3bcbd80f78be3814ec3a8ce9ffe0ab58031bed5f. --- .../workflows/scripts/check-license-header.sh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/scripts/check-license-header.sh b/.github/workflows/scripts/check-license-header.sh index 0ee65dff..cdc1223e 100755 --- a/.github/workflows/scripts/check-license-header.sh +++ b/.github/workflows/scripts/check-license-header.sh @@ -39,20 +39,17 @@ fi paths_with_missing_license=( ) -static_exclude_list=( ) -static_exclude_list+=( '":(exclude).license_header_template"' ) -static_exclude_list+=( '":(exclude).swift-version"' ) # Swift version files do not have comments nor licenses in them -dynamic_exclude_list=( ) - if [[ -f .licenseignore ]]; then - static_exclude_list+=( '":(exclude).licenseignore"' ) - IFS=$'\n' read -d '' -r -a dynamic_exclude_list <<< $(sed -E 's/^(.*)$/":(exclude)\1"/' <.licenseignore) + static_exclude_list='":(exclude).licenseignore" ":(exclude).license_header_template" ' + dynamic_exclude_list=$(tr '\n' '\0' < .licenseignore | xargs -0 -I% printf '":(exclude)%" ') + exclude_list=$static_exclude_list$dynamic_exclude_list +else + exclude_list=":(exclude).license_header_template" fi -exclude_list=( "${static_exclude_list[@]}" "${dynamic_exclude_list[@]}" ) -excludes=$(IFS=" " ; echo "${exclude_list[*]}") +exclude_list="${exclude_list}:(exclude).swift-version" # Swift version files will never have license headers in them -file_paths=$(echo "$excludes" | xargs git ls-files) +file_paths=$(echo "$exclude_list" | xargs git ls-files) while IFS= read -r file_path; do file_basename=$(basename -- "${file_path}") From 03263cafa04f0ba58ad87c424dd5e9fd631008bf Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Wed, 14 May 2025 15:01:18 -0400 Subject: [PATCH 4/4] Revert "Add swift version files as exclusions to the license header checks" This reverts commit 32269f3d867190ca519b53b7ce941b7105cf5eff. --- .github/workflows/scripts/check-license-header.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/scripts/check-license-header.sh b/.github/workflows/scripts/check-license-header.sh index cdc1223e..845eb254 100755 --- a/.github/workflows/scripts/check-license-header.sh +++ b/.github/workflows/scripts/check-license-header.sh @@ -47,8 +47,6 @@ else exclude_list=":(exclude).license_header_template" fi -exclude_list="${exclude_list}:(exclude).swift-version" # Swift version files will never have license headers in them - file_paths=$(echo "$exclude_list" | xargs git ls-files) while IFS= read -r file_path; do