From 642cd9d7c68edfa8999ea35405a42bfff3265380 Mon Sep 17 00:00:00 2001 From: jessicaway Date: Thu, 5 Dec 2024 07:59:08 -0700 Subject: [PATCH 1/3] reproducing error in changelog parsing --- scripts/common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/common.sh b/scripts/common.sh index f392525683..f747bd7436 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -46,6 +46,7 @@ function get_modified_pipelines() { local -r commitToCompare=${1} local -r -a pipelines=($(get_versioned_pipelines)) local -r -a changedWdls=($(git diff --name-only HEAD ${commitToCompare} | grep -E '.*\.wdl' | xargs -n1 basename)) + # local -r -a changedWdls=($(git diff --name-only HEAD ${commitToCompare} | grep -E '.*\.wdl' | xargs -n1 basename || echo "")) local -a modifiedPipelines=() for pipeline in ${pipelines[@]}; do if [[ " ${changedWdls[@]}" =~ " $(basename ${pipeline})" ]]; then From 24b817a6ab8082d8a02a400fe1bac886d6149634 Mon Sep 17 00:00:00 2001 From: jessicaway Date: Thu, 9 Jan 2025 11:25:06 -0700 Subject: [PATCH 2/3] testing --- scripts/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/common.sh b/scripts/common.sh index f747bd7436..bc41df6304 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -45,8 +45,8 @@ function get_versioned_pipelines() { function get_modified_pipelines() { local -r commitToCompare=${1} local -r -a pipelines=($(get_versioned_pipelines)) - local -r -a changedWdls=($(git diff --name-only HEAD ${commitToCompare} | grep -E '.*\.wdl' | xargs -n1 basename)) - # local -r -a changedWdls=($(git diff --name-only HEAD ${commitToCompare} | grep -E '.*\.wdl' | xargs -n1 basename || echo "")) + #local -r -a changedWdls=($(git diff --name-only HEAD ${commitToCompare} | grep -E '.*\.wdl' | xargs -n1 basename)) + local -r -a changedWdls=($(git diff --name-only HEAD ${commitToCompare} | grep -E '.*\.wdl' | xargs -n1 basename || echo "")) local -a modifiedPipelines=() for pipeline in ${pipelines[@]}; do if [[ " ${changedWdls[@]}" =~ " $(basename ${pipeline})" ]]; then From 929fa520b4a83ddab8c2820a606238ee4d937fac Mon Sep 17 00:00:00 2001 From: jessicaway Date: Thu, 9 Jan 2025 11:32:39 -0700 Subject: [PATCH 3/3] testing --- scripts/validate_release.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/validate_release.sh b/scripts/validate_release.sh index b9277c8498..9849aaf210 100755 --- a/scripts/validate_release.sh +++ b/scripts/validate_release.sh @@ -73,7 +73,9 @@ function validate_changelog_changes() { function validate_versions_and_changelogs() { local commitToCompare=${1} + echo "Finding modified pipelines" local -r -a modifiedPipelines=($(get_modified_pipelines ${commitToCompare})) + echo "Found modified pipelines" local allPipelinesValid=true stderr "Comparing versions and changelogs for pipelines that differ from the versions on '${commitToCompare}':"