[ARVADOS-DEV] updated: 27880e36c02ea90649f0badfb8e88894ede6f6ce

git at public.curoverse.com git at public.curoverse.com
Thu Oct 9 10:17:59 EDT 2014


Summary of changes:
 jenkins/run-build-packages.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  27880e36c02ea90649f0badfb8e88894ede6f6ce (commit)
       via  1530c4fdb9c691ac378ebc67ff3c5775f2f9ee9b (commit)
      from  eefe18d01ac964d062e32b9bbc7eed306fee9a8c (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 27880e36c02ea90649f0badfb8e88894ede6f6ce
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Oct 9 10:16:46 2014 -0400

    Switch to human readable timestamps (YYYYMMDDhhmmss in UTC) for all our
    debian packages.
    
    No issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 878a9c2..5f0d13e 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -235,7 +235,9 @@ fi
 
 cd "$WORKSPACE"
 
-GIT_HASH=`git log --format=format:%ct.%h -n1 .`
+GIT_TIMESTAMP=`git log --format=format:%ct -n1 .`
+HUMAN_READABLE_TIMESTAMP=`TZ=UTC date -d @$GIT_TIMESTAMP +%Y%m%d%H%M%S`
+GIT_HASH=`git log --format=format:$HUMAN_READABLE_TIMESTAMP.%h -n1 .`
 
 cd sdk/python
 handle_python_package

commit 1530c4fdb9c691ac378ebc67ff3c5775f2f9ee9b
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Oct 9 10:12:39 2014 -0400

    Improve output when fpm call fails.
    
    No issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index bbd4a2a..878a9c2 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -150,7 +150,10 @@ build_and_scp_deb () {
 
   if [[ "$FPM_PACKAGE_NAME" == "" ]]; then
     EXITCODE=1
-    echo "Error: Unable to figure out package name from fpm results:\n $FPM_RESULTS"
+    echo "Error: Unable to figure out package name from fpm results:"
+    echo
+    echo $FPM_RESULTS
+    echo
   else
     if [[ ! $FPM_RESULTS =~ "File already exists" ]]; then
       if [[ "$FPM_EXIT_CODE" != "0" ]]; then

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list