[ARVADOS-DEV] updated: 9e4360d3c323f6d9b25055b142b87295236bc648

git at public.curoverse.com git at public.curoverse.com
Mon Jun 30 13:36:24 EDT 2014


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

       via  9e4360d3c323f6d9b25055b142b87295236bc648 (commit)
      from  8ada64214ea1a4cf63748b32a7edaa2317709f7d (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 9e4360d3c323f6d9b25055b142b87295236bc648
Author: Ward Vandewege <ward at curoverse.com>
Date:   Mon Jun 30 13:35:51 2014 -0400

    Make sure the arvados-src package actually contains the latest source. Duh.
    
    no issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 3891d97..5a331c1 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -128,13 +128,20 @@ if [[ ! -d "$WORKSPACE/src-build-dir" ]]; then
 fi  
 
 cd "$WORKSPACE/src-build-dir"
-git fetch -a
-git checkout $GIT_REV
+# just in case, check out master
+git checkout master
+git pull
+# go into detached-head state
+git checkout `git log --format=format:%h -n1 .`
 cd $WORKSPACE
 
 cd $WORKSPACE/debs
 build_and_scp_deb $WORKSPACE/src-build-dir/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' 'dir' "-v 0.1.$GIT_HASH -x 'usr/local/arvados/src/.git*'"
 
+# clean up, check out master and step away from detached-head state
+cd "$WORKSPACE/src-build-dir"
+git checkout master
+
 # Keep
 cd $WORKSPACE/services/keep
 ./go.sh install keep

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list