[ARVADOS] updated: 1.1.4-361-g0809440

Git user git at public.curoverse.com
Tue Jun 5 15:58:02 EDT 2018


Summary of changes:
 apps/workbench/test/integration_helper.rb | 2 ++
 build/run-tests.sh                        | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

       via  0809440ad583a2556c0f97fd000be9e9b7f94eb5 (commit)
       via  7654764e5192fc8d34e612a6ee6608fad33a91c2 (commit)
       via  cae5f7def9dae9caf9056bc3bb77ca801cfa2229 (commit)
      from  0eedf70afa34167275d2135837e866b13fac4178 (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 0809440ad583a2556c0f97fd000be9e9b7f94eb5
Merge: 7654764 cae5f7d
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jun 5 15:56:57 2018 -0400

    Merge branch '13456-phantomjs-died'
    
    refs #13456
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit 7654764e5192fc8d34e612a6ee6608fad33a91c2
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jun 5 15:11:38 2018 -0400

    More gopath symlink hacks.
    
    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 2b280c7..1b6e4f1 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -515,12 +515,14 @@ export GOPATH
     mkdir -p "$GOPATH/src/git.curoverse.com"
     rmdir -v --parents --ignore-fail-on-non-empty "${temp}/GOPATH"
     for d in \
-        "$GOPATH/src/git.curoverse.com/arvados.git/arvados.git" \
-            "$GOPATH/src/git.curoverse.com/arvados.git"; do
+        "$GOPATH/src/git.curoverse.com/arvados.git/tmp/GOPATH" \
+        "$GOPATH/src/git.curoverse.com/arvados.git/tmp" \
+        "$GOPATH/src/git.curoverse.com/arvados.git/arvados" \
+        "$GOPATH/src/git.curoverse.com/arvados.git"; do
         [[ -d "$d" ]] && rmdir "$d"
         [[ -h "$d" ]] && rm "$d"
     done
-    ln -vsnfT "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git"
+    ln -vsfT "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git"
     go get -v github.com/kardianos/govendor
     cd "$GOPATH/src/git.curoverse.com/arvados.git"
     if [[ -n "$short" ]]; then

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list