[ARVADOS] updated: 2.1.0-237-ga19b9565c

Git user git at public.arvados.org
Wed Dec 23 16:58:20 UTC 2020


Summary of changes:
 build/run-build-packages.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

       via  a19b9565c586cb97cfc2777bbaf17b9fbf6d98af (commit)
      from  b8679688545cab79988c568b531d2496fc93cd6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a19b9565c586cb97cfc2777bbaf17b9fbf6d98af
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Dec 23 11:58:03 2020 -0500

    Fix arvados-src package version generation.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 42c5f3d09..9030072d5 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -259,10 +259,8 @@ debug_echo -e "\nPython packages\n"
       git checkout $DASHQ_UNLESS_DEBUG "$COMMIT_HASH"
       echo "$COMMIT_HASH" >git-commit.version
 
-      cd "$SRC_BUILD_DIR"
-      PKG_VERSION=$(version_from_git)
       cd $WORKSPACE/packages/$TARGET
-      fpm_build "$WORKSPACE" $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'dir' "$PKG_VERSION" "--exclude=usr/local/arvados/src/.git" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=The Arvados source code" "--architecture=all"
+      fpm_build "$WORKSPACE" $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'dir' "$arvados_src_version" "--exclude=usr/local/arvados/src/.git" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=The Arvados source code" "--architecture=all"
 
       rm -rf "$SRC_BUILD_DIR"
     fi

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list