From 456a76e652ae73c2947da830bb36cfe8595761c8 Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Mon, 23 Oct 2023 23:37:45 +0000 Subject: [PATCH 1/2] added -u to global checkout so CI test builds tests for GDASapps --- ci/scripts/check_ci.sh | 4 ++-- ci/scripts/clone-build_ci.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/scripts/check_ci.sh b/ci/scripts/check_ci.sh index d5cf6a20bd..b2b60f0d27 100755 --- a/ci/scripts/check_ci.sh +++ b/ci/scripts/check_ci.sh @@ -89,9 +89,9 @@ for pr in ${pr_list}; do # Check to see if this PR that was opened by the weekly tests and if so close it if it passed on all platforms weekly_labels=$(${GH} pr view "${pr}" --repo "${REPO_URL}" --json headRefName,labels,author --jq 'select(.author.login | contains("emcbot")) | select(.headRefName | contains("weekly_ci")) | .labels[].name ') || true if [[ -n "${weekly_labels}" ]]; then - num_platforms=$(find ../platforms -type f -name "config.*" | wc -l) + num_platforms=$(find ${ROOT_DIR}/ci/platforms -type f -name "config.*" | wc -l) passed=0 - for platforms in ../platforms/config.*; do + for platforms in ${ROOT_DIR}/ci/platforms/config.*; do machine=$(basename "${platforms}" | cut -d. -f2) if [[ "${weekly_labels}" == *"CI-${machine^}-Passed"* ]]; then ((passed=passed+1)) diff --git a/ci/scripts/clone-build_ci.sh b/ci/scripts/clone-build_ci.sh index 796e4b7014..03eff13158 100755 --- a/ci/scripts/clone-build_ci.sh +++ b/ci/scripts/clone-build_ci.sh @@ -79,7 +79,7 @@ echo "${commit}" > "../commit" cd sorc || exit 1 set +e # TODO enable -u later when GDASApp tests are added -./checkout.sh -c -g >> log.checkout 2>&1 +./checkout.sh -c -g -u >> log.checkout 2>&1 checkout_status=$? if [[ ${checkout_status} != 0 ]]; then { From fa8de6598654c4a4b4c3eb94c7fde71d48d05633 Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Mon, 23 Oct 2023 23:45:05 +0000 Subject: [PATCH 2/2] Update check_ci.sh needed more quotes --- ci/scripts/check_ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/scripts/check_ci.sh b/ci/scripts/check_ci.sh index b2b60f0d27..097e20ced4 100755 --- a/ci/scripts/check_ci.sh +++ b/ci/scripts/check_ci.sh @@ -89,9 +89,9 @@ for pr in ${pr_list}; do # Check to see if this PR that was opened by the weekly tests and if so close it if it passed on all platforms weekly_labels=$(${GH} pr view "${pr}" --repo "${REPO_URL}" --json headRefName,labels,author --jq 'select(.author.login | contains("emcbot")) | select(.headRefName | contains("weekly_ci")) | .labels[].name ') || true if [[ -n "${weekly_labels}" ]]; then - num_platforms=$(find ${ROOT_DIR}/ci/platforms -type f -name "config.*" | wc -l) + num_platforms=$(find "${ROOT_DIR}/ci/platforms" -type f -name "config.*" | wc -l) passed=0 - for platforms in ${ROOT_DIR}/ci/platforms/config.*; do + for platforms in "${ROOT_DIR}"/ci/platforms/config.*; do machine=$(basename "${platforms}" | cut -d. -f2) if [[ "${weekly_labels}" == *"CI-${machine^}-Passed"* ]]; then ((passed=passed+1))