[ARVADOS] updated: 1.1.3-153-g2f3b9a7
Git user
git at public.curoverse.com
Mon Mar 12 12:06:05 EDT 2018
Summary of changes:
build/run-library.sh | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
via 2f3b9a751367f13eeff08a0e59c2117f19c16310 (commit)
from 8ec134dfc6384829c990a9cf70b675da55802037 (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 2f3b9a751367f13eeff08a0e59c2117f19c16310
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Mon Mar 12 13:05:56 2018 -0300
13200:test new job with timestamp only removing hash
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 df86dee..a9e6202 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -46,19 +46,12 @@ 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
- echo "$ARVADOS_BUILDING_VERSION"
- return
- fi
-
- local git_ts git_hash prefix
- if [[ -n "$1" ]] ; then
- prefix="$1"
- else
- prefix="0.1"
+ 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
fi
- declare $(format_last_commit_here "git_ts=%ct")
- echo "${prefix}.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
}
nohash_version_from_git() {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list