[ARVADOS] updated: 1.1.0-39-gfda2e31

Git user git at public.curoverse.com
Tue Oct 10 10:20:31 EDT 2017


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

       via  fda2e317aecabc5a2019ba91edccd7b770a8753e (commit)
      from  d7bfcf3b64bf5379f994ec1831233f77db5c3117 (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 fda2e317aecabc5a2019ba91edccd7b770a8753e
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Tue Oct 10 11:20:20 2017 -0300

    12389: remove changes in run build packages
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index e2105ca..45882cd 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -201,7 +201,7 @@ debug_echo -e "\nPerl packages\n"
 
 if [[ -z "$ONLY_BUILD" ]] || [[ "libarvados-perl" = "$ONLY_BUILD" ]] ; then
   cd "$WORKSPACE/sdk/perl"
-  libarvados_perl_version="$(version_from_latest_tag)"
+  libarvados_perl_version="$(version_from_git)"
 
   cd $WORKSPACE/packages/$TARGET
   test_package_presence libarvados-perl "$libarvados_perl_version"
@@ -219,7 +219,7 @@ if [[ -z "$ONLY_BUILD" ]] || [[ "libarvados-perl" = "$ONLY_BUILD" ]] ; then
     perl Makefile.PL INSTALL_BASE=install >"$STDOUT_IF_DEBUG" && \
         make install INSTALLDIRS=perl >"$STDOUT_IF_DEBUG" && \
         fpm_build install/lib/=/usr/share libarvados-perl \
-        "Curoverse, Inc." dir "$(version_from_latest_tag)" install/man/=/usr/share/man \
+        "Curoverse, Inc." dir "$(version_from_git)" install/man/=/usr/share/man \
         "$WORKSPACE/apache-2.0.txt=/usr/share/doc/libarvados-perl/apache-2.0.txt" && \
         mv --no-clobber libarvados-perl*.$FORMAT "$WORKSPACE/packages/$TARGET/"
   fi
@@ -261,7 +261,7 @@ handle_python_package
 (
     cd "$WORKSPACE"
     COMMIT_HASH=$(format_last_commit_here "%H")
-    arvados_src_version="$(version_from_latest_tag)"
+    arvados_src_version="$(version_from_git)"
 
     cd $WORKSPACE/packages/$TARGET
     test_package_presence arvados-src $arvados_src_version src ""
@@ -279,7 +279,7 @@ handle_python_package
       echo "$COMMIT_HASH" >git-commit.version
 
       cd "$SRC_BUILD_DIR"
-      PKG_VERSION=$(version_from_latest_tag)
+      PKG_VERSION=$(version_from_git)
       cd $WORKSPACE/packages/$TARGET
       fpm_build $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' '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"
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list