[ARVADOS] updated: 1.3.0-2075-gecf1cbf6b

Git user git at public.arvados.org
Thu Jan 16 15:42:17 UTC 2020


Summary of changes:
 build/version-at-commit.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

       via  ecf1cbf6b843ec566890b4bf944fb893ca9481de (commit)
      from  8e3b1abebc4256256e6e5f4f82e3e25618c0dfcd (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 ecf1cbf6b843ec566890b4bf944fb893ca9481de
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jan 16 10:40:08 2020 -0500

    version-at-commit.sh uses '.dev' instead of '.pre'
    
    Makes Python happy -- setuptools allows '.dev' in the version, but
    normalizes '.pre' into '.rc' which actually changes the package
    filename.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/build/version-at-commit.sh b/build/version-at-commit.sh
index 3a52c4b20..6ed34244a 100755
--- a/build/version-at-commit.sh
+++ b/build/version-at-commit.sh
@@ -3,6 +3,7 @@
 set -e -o pipefail
 commit="$1"
 versionglob="[0-9].[0-9]*.[0-9]*"
+devsuffix=".dev"
 
 if ! git describe --exact-match --match "$versionglob" "$commit" 2>/dev/null; then
     if git merge-base --is-ancestor "$commit" origin/master; then
@@ -14,5 +15,5 @@ if ! git describe --exact-match --match "$versionglob" "$commit" 2>/dev/null; th
     fi
     isodate=$(TZ=UTC git log -n1 --format=%cd --date=iso "$commit")
     ts=$(TZ=UTC date --date="$isodate" "+%Y%m%d%H%M%S")
-    echo "$v.pre$ts"
+    echo "${v}${devsuffix}${ts}"
 fi

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list