[ARVADOS-DEV] updated: 81b4b70978fe97e6bd22bcb85cdfa36131f2f012

git at public.curoverse.com git at public.curoverse.com
Fri Aug 14 17:35:33 EDT 2015


Summary of changes:
 jenkins/dockerfiles/centos6/Dockerfile    |   2 +-
 jenkins/dockerfiles/debian7/Dockerfile    |   2 +-
 jenkins/dockerfiles/debian8/Dockerfile    |   2 +-
 jenkins/dockerfiles/ubuntu1204/Dockerfile |   2 +-
 jenkins/dockerfiles/ubuntu1404/Dockerfile |   2 +-
 jenkins/run-build-packages.sh             | 205 ++++++++++++------------------
 6 files changed, 83 insertions(+), 132 deletions(-)

       via  81b4b70978fe97e6bd22bcb85cdfa36131f2f012 (commit)
       via  b0dd0080e98ffccb2d48f247583f55c8937bda84 (commit)
       via  3f03b72f0c24ee2c5abfe5654107f6e1c019bc15 (commit)
       via  59c684f9e8a545ffae5036b193d09e9c8ab7e689 (commit)
       via  bf4baab1c1e2a422334fc07d77a44036832583a9 (commit)
       via  dfc5f78444e593f24ab976a6ad472c2d1dce12b9 (commit)
       via  988b1304d57f960f1006af52dc700026061a280e (commit)
      from  7701a7ad84b0d4fb4642568bd75f63a5c0586658 (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 81b4b70978fe97e6bd22bcb85cdfa36131f2f012
Merge: 7701a7a b0dd008
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Aug 14 17:32:58 2015 -0400

    Merge branch '6638-backport-deps' refs #6638


commit b0dd0080e98ffccb2d48f247583f55c8937bda84
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Aug 14 14:37:12 2015 -0400

    6638: Use (git clone; git checkout) -- git clone --branch doesn't work with commit hashes.

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 60d7ab6..fed66e5 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -441,8 +441,11 @@ handle_python_package
     COMMIT_HASH=$(format_last_commit_here "%H")
 
     SRC_BUILD_DIR=$(mktemp -d)
-    git clone $DASHQ_UNLESS_DEBUG --branch "$COMMIT_HASH" "$WORKSPACE/.git" "$SRC_BUILD_DIR"
+    git clone $DASHQ_UNLESS_DEBUG "$WORKSPACE/.git" "$SRC_BUILD_DIR"
     cd "$SRC_BUILD_DIR"
+
+    # go into detached-head state
+    git checkout $DASHQ_UNLESS_DEBUG "$COMMIT_HASH"
     echo "$COMMIT_HASH" >git-commit.version
 
     cd "$SRC_BUILD_DIR"

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list