[ARVADOS] updated: 1.1.3-169-g62899a1
Git user
git at public.curoverse.com
Tue Mar 20 15:43:56 EDT 2018
Summary of changes:
build/run-build-packages.sh | 2 +-
build/run-library.sh | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
via 62899a1e2070f210f1306c97777a50c1137c19ec (commit)
from 41d7cbeab78bd03c7f11c0b09c0d36912094c8a3 (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 62899a1e2070f210f1306c97777a50c1137c19ec
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date: Tue Mar 20 16:43:49 2018 -0300
13200:test changes to not build package if no change is present
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 497545d..a302997 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
diff --git a/build/run-library.sh b/build/run-library.sh
index 04add5c..12cb408 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
# Copyright (C) The Arvados Authors. All rights reserved.
#
# SPDX-License-Identifier: AGPL-3.0
@@ -50,9 +50,14 @@ version_from_git() {
return
fi
- local git_ts
+ local git_ts git_hash prefix
+ if [[ -n "$1" ]] ; then
+ prefix="$1"
+ else
+ prefix="0.1"
+ fi
- declare $(format_last_commit_here "git_ts=%ct")
+ declare $(format_last_commit_here "git_ts=%ct git_hash=%h")
ARVADOS_BUILDING_VERSION="$(git describe --abbrev=0).$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
echo "$ARVADOS_BUILDING_VERSION"
}
@@ -71,7 +76,7 @@ timestamp_from_git() {
handle_python_package () {
# This function assumes the current working directory is the python package directory
- if [ -n "$(find dist -name "*-$(version_from_git).$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
+ if [ -n "$(find dist -name "*-$(version_from_git).tar.gz" -print -quit)" ]; then
# This package doesn't need rebuilding.
return
fi
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list