[ARVADOS] updated: 1.1.0-45-g60adc06

Git user git at public.curoverse.com
Wed Oct 11 11:28:51 EDT 2017


Summary of changes:
 build/build-dev-docker-jobs-image.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  60adc068864d37205a710084e495f77117ee1579 (commit)
      from  6a5e506b5ff93f8c482f0839f40f175e018f202e (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 60adc068864d37205a710084e495f77117ee1579
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Oct 11 12:28:42 2017 -0300

    12389: fix update gittaggers for latest tag
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/build-dev-docker-jobs-image.sh b/build/build-dev-docker-jobs-image.sh
index 639096c..194ecfc 100755
--- a/build/build-dev-docker-jobs-image.sh
+++ b/build/build-dev-docker-jobs-image.sh
@@ -65,9 +65,9 @@ python_sdk_ts=$(cd sdk/python && timestamp_from_git)
 cwl_runner_ts=$(cd sdk/cwl && timestamp_from_git)
 
 if [[ $python_sdk_ts -gt $cwl_runner_ts ]]; then
-    gittag=$(git log --first-parent --max-count=1 --format=format:%H sdk/python)
+    gittag=$(git describe --abbrev=0 sdk/python)
 else
-    gittag=$(git log --first-parent --max-count=1 --format=format:%H sdk/cwl)
+    gittag=$(git describe --abbrev=0 sdk/cwl)
 fi
 
 docker build --build-arg sdk=$sdk --build-arg runner=$runner --build-arg salad=$salad --build-arg cwltool=$cwltool -f "$WORKSPACE/sdk/dev-jobs.dockerfile" -t arvados/jobs:$gittag "$WORKSPACE/sdk"

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list