[ARVADOS] updated: 1.2.0-362-g01d676963

Git user git at public.curoverse.com
Tue Nov 13 16:20:47 EST 2018


Summary of changes:
 build/run-tests.sh                |  4 ++--
 lib/controller/federation.go      |  7 ++++++-
 lib/controller/federation_test.go | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

       via  01d676963b14daa0ad6e0242f6ee73660500a3ad (commit)
       via  f731a77a92ee926951422934959db21438d03de3 (commit)
       via  2463e56150d0d10997f6b11ab0828c4b23d575df (commit)
      from  66d07bb91f91b0cd4c92c7ffa913f7181a3d4942 (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 01d676963b14daa0ad6e0242f6ee73660500a3ad
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Nov 13 16:19:40 2018 -0500

    Fix git command.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 2fb82554a..cd44347cb 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -689,7 +689,7 @@ do_test_once() {
         # before trying "go test". Otherwise, coverage-reporting
         # mode makes Go show the wrong line numbers when reporting
         # compilation errors.
-        go get -ldflags "-X main.version=${ARVADOS_VERSION:-$(git head)-dev}" -t "git.curoverse.com/arvados.git/$1" && \
+        go get -ldflags "-X main.version=${ARVADOS_VERSION:-$(git log -n1 --format=%H)-dev}" -t "git.curoverse.com/arvados.git/$1" && \
             cd "$GOPATH/src/git.curoverse.com/arvados.git/$1" && \
             [[ -z "$(gofmt -e -d . | tee /dev/stderr)" ]] && \
             if [[ -n "${testargs[$1]}" ]]
@@ -757,7 +757,7 @@ do_install_once() {
     timer_reset
     if [[ "$2" == "go" ]]
     then
-        go get -ldflags "-X main.version=${ARVADOS_VERSION:-$(git head)-dev}" -t "git.curoverse.com/arvados.git/$1"
+        go get -ldflags "-X main.version=${ARVADOS_VERSION:-$(git log -n1 --format=%H)-dev}" -t "git.curoverse.com/arvados.git/$1"
     elif [[ "$2" == "pip" ]]
     then
         # $3 can name a path directory for us to use, including trailing

commit f731a77a92ee926951422934959db21438d03de3
Merge: 66d07bb91 2463e5615
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Nov 13 16:18:59 2018 -0500

    Merge branch '14475-update-collection-error'
    
    fixes #14475
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list