[ARVADOS] created: ae64e7fbd18ea5c0dc4c289433d5a2f02d20efa1

[Git user]

        at  ae64e7fbd18ea5c0dc4c289433d5a2f02d20efa1 (commit)


commit ae64e7fbd18ea5c0dc4c289433d5a2f02d20efa1
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Oct 25 17:21:17 2016 -0400

    10194: Record aravdos/jobs image version in jobs-commit.version file of source
    package as latest of either sdk/python or sdk/cwl.

diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh
index 7b5ea4e..1519e79 100755
--- a/build/run-build-docker-jobs-image.sh
+++ b/build/run-build-docker-jobs-image.sh
@@ -122,7 +122,7 @@ python_sdk_version=$(cd sdk/python && nohash_version_from_git 0.1)-2
 cwl_runner_version=$(cd sdk/cwl && nohash_version_from_git 1.0)-3
 
 if [[ $python_sdk_ts -gt $cwl_runner_ts ]]; then
-    cwl_runner_version=$python_sdk_version
+    cwl_runner_version=$(cd sdk/python && nohash_version_from_git 1.0)-3
     gittag=$(cd sdk/python && git log --first-parent --max-count=1 --format=format:%H)
 else
     gittag=$(cd sdk/cwl && git log --first-parent --max-count=1 --format=format:%H)
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index c84e2cc..77976ac 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -312,6 +312,7 @@ handle_python_package
     # go into detached-head state
     git checkout $DASHQ_UNLESS_DEBUG "$COMMIT_HASH"
     echo "$COMMIT_HASH" >git-commit.version
+    latest_commit_among_dirs sdk/python sdk/cwl >jobs-commit.version
 
     cd "$SRC_BUILD_DIR"
     PKG_VERSION=$(version_from_git)
diff --git a/build/run-library.sh b/build/run-library.sh
index f0b120f..b36a29c 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -420,3 +420,16 @@ report_outcomes() {
         done
     fi
 }
+
+latest_commit_among_dirs() {
+    local maxts=0
+    local ver=""
+    for dir in $@ ; do
+        ts=$(cd $dir && timestamp_from_git)
+        if [[ $ts -gt $maxts ]]; then
+            maxts=$ts
+            ver=$(cd $dir && format_last_commit_here %H)
+        fi
+    done
+    echo $ver
+}

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


hooks/post-receive
--