Merge branch '8784-dir-listings'

[arvados.git] / build / run-build-docker-jobs-image.sh

diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh
index 7b5ea4ecec6bcda873ed8a98ea09d862e8dd86f4..90079268f896f986d2c3e876c2a4d860dcc21c46 100755 (executable)
--- a/build/run-build-docker-jobs-image.sh
+++ b/build/run-build-docker-jobs-image.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 function usage {
     echo >&2
@@ -122,10 +125,10 @@ 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
-    gittag=$(cd sdk/python && git log --first-parent --max-count=1 --format=format:%H)
+    cwl_runner_version=$(cd sdk/python && nohash_version_from_git 1.0)-3
+    gittag=$(git log --first-parent --max-count=1 --format=format:%H sdk/python)
 else
-    gittag=$(cd sdk/cwl && git log --first-parent --max-count=1 --format=format:%H)
+    gittag=$(git log --first-parent --max-count=1 --format=format:%H sdk/cwl)
 fi
 
 echo cwl_runner_version $cwl_runner_version python_sdk_version $python_sdk_version