From 9fb5ac36ed7f2303bc6a281cc62b2633c5f56fb2 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 25 Apr 2023 16:51:19 +0200 Subject: [PATCH] Allow update of subcomponents to be skipped Signed-off-by: Evan Lezar --- scripts/build-packages.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index 06f8ba0a..7d424838 100755 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -46,12 +46,16 @@ else targets=${all[@]} fi -echo "Updating components" -"${SCRIPTS_DIR}/update-components.sh" -if [[ -n $(git status -s third_party) && ${ALLOW_LOCAL_COMPONENT_CHANGES} != "true" ]]; then - echo "ERROR: Building with local component changes." - echo "Commit pending changes or rerun with ALLOW_LOCAL_COMPONENT_CHANGES='true'" - exit 1 +if [[ -z ${SKIP_UPDATE_COMPONENTS} ]]; then + echo "Updating components" + "${SCRIPTS_DIR}/update-components.sh" + if [[ -n $(git status -s third_party) && ${ALLOW_LOCAL_COMPONENT_CHANGES} != "true" ]]; then + echo "ERROR: Building with local component changes." + echo "Commit pending changes or rerun with ALLOW_LOCAL_COMPONENT_CHANGES='true'" + exit 1 + fi +else + echo "Skipping update of components" fi eval $(${SCRIPTS_DIR}/get-component-versions.sh)