[ARVADOS] updated: 1.1.3-154-g66e32ef

[Git user]

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

       via  66e32efca2036a2c95dc2ece57764bc3486ae55f (commit)
      from  2f3b9a751367f13eeff08a0e59c2117f19c16310 (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 66e32efca2036a2c95dc2ece57764bc3486ae55f
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Mar 12 15:12:22 2018 -0300

    13200:new version using git tag latest and timestamp only
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index a9e6202..96ccf48 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -46,12 +46,20 @@ version_from_git() {
     # dev/prerelease, output a version number based on the git log for
     # the current working directory.
     if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
-      local git_ts git_hash prefix
-      declare $(format_last_commit_here "git_ts=%ct")
-      echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
-      return
+        echo "$ARVADOS_BUILDING_VERSION"
+        return
+    fi
+
+    $ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
+    local git_ts 
+    if [[ -n "$1" ]] ; then
+        prefix="$1"
+    else
+        prefix="0.1"
     fi
 
+    declare $(format_last_commit_here "git_ts=%ct")
+    echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
 }
 
 nohash_version_from_git() {

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


hooks/post-receive
--