From 7b69c2a7f763190954cb767aa2cd26dc87c727fe Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Wed, 5 Jan 2022 10:27:02 -0500 Subject: [PATCH] 17417: another optimization: instead of building the arvados-python-client sdist regardless of the value of $ONLY_BUILD, only do it when it is actually needed. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/run-library.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/build/run-library.sh b/build/run-library.sh index 3434f1ae89..b6bb9ab370 100755 --- a/build/run-library.sh +++ b/build/run-library.sh @@ -728,11 +728,17 @@ fpm_build_virtualenv () { PYTHON_PKG=$pkg fi - # arvados-python-client sdist should always be built, to be available - # for other dependent packages. - if [[ -n "$ONLY_BUILD" ]] && [[ "arvados-python-client" != "$pkg" ]] && [[ "$PYTHON_PKG" != "$ONLY_BUILD" ]] && [[ "$pkg" != "$ONLY_BUILD" ]]; then - debug_echo -e "Skipping build of $pkg package." - return 0 + if [[ -n "$ONLY_BUILD" ]] && [[ "$PYTHON_PKG" != "$ONLY_BUILD" ]]; then + # arvados-python-client sdist should always be built if we are building a + # python package. + if [[ "$ONLY_BUILD" != "python3-arvados-cwl-runner" ]] && + [[ "$ONLY_BUILD" != "python3-arvados-fuse" ]] && + [[ "$ONLY_BUILD" != "python3-crunchstat-summary" ]] && + [[ "$ONLY_BUILD" != "arvados-docker-cleaner" ]] && + [[ "$ONLY_BUILD" != "python3-arvados-user-activity" ]]; then + debug_echo -e "Skipping build of $pkg package." + return 0 + fi fi if [[ -n "$target_arch" ]] && [[ "$native_arch" == "$target_arch" ]]; then -- 2.30.2