[ARVADOS] updated: 1.1.0-35-gfc8eb82

Git user git at public.curoverse.com
Mon Oct 9 15:14:32 EDT 2017


Summary of changes:
 build/run-build-packages.sh | 8 ++++----
 build/run-library.sh        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

       via  fc8eb82bbf1769f5d636d279c9b514cf0b12acc1 (commit)
      from  a6a6e64a48664df14df4ff2aeddf2c727563ea03 (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 fc8eb82bbf1769f5d636d279c9b514cf0b12acc1
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Oct 9 16:14:22 2017 -0300

    12389: try to fix python version hash in n-build-packages.sh
    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 2cde946..76524b5 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_git)"
+  libarvados_perl_version="$(version_from_latest_tag)"
 
   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_git)" install/man/=/usr/share/man \
+        "Curoverse, Inc." dir "$(version_from_latest_tag)" 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_git)"
+    arvados_src_version="$(version_from_latest_tag)"
 
     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_git)
+      PKG_VERSION=$(version_from_latest_tag)
       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"
 
diff --git a/build/run-library.sh b/build/run-library.sh
index 078caed..a0d7d53 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -138,7 +138,7 @@ package_go_binary() {
         ts="$(timestamp_from_git)"
         if [[ "$ts" -gt "$timestamp" ]]; then
             version=$(version_from_latest_tag)
-#            timestamp="$ts"
+            timestamp="$ts"
         fi
     done
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list