[ARVADOS] updated: 1.3.0-1242-gefc383a2b

[Git user]

Summary of changes:
 build/run-tests.sh                    | 1 +
 lib/controller/federation/generate.go | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

       via  efc383a2bc2683a246052eac21086826949a0213 (commit)
       via  472caa7d3a5df65f77f279fa991726e6dd3a8df8 (commit)
      from  3dbbbd49b1889d832c295a4bb69dd360abf614fa (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 efc383a2bc2683a246052eac21086826949a0213
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Jul 4 09:24:43 2019 -0400

    14287: Remove extra panic after error running goimports.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/controller/federation/generate.go b/lib/controller/federation/generate.go
index 1f37df858..11f021e51 100644
--- a/lib/controller/federation/generate.go
+++ b/lib/controller/federation/generate.go
@@ -49,6 +49,7 @@ func main() {
 		panic(err)
 	}
 	go func() {
+		defer out.Close()
 		out.Write(regexp.MustCompile(`(?ms)^.*package .*?import.*?\n\)\n`).Find(buf))
 		io.WriteString(out, "//\n// -- this file is auto-generated -- do not edit -- edit list.go and run \"go generate\" instead --\n//\n\n")
 		for _, t := range []string{"Container", "Specimen"} {
@@ -57,10 +58,6 @@ func main() {
 				panic(err)
 			}
 		}
-		err = out.Close()
-		if err != nil {
-			panic(err)
-		}
 	}()
 	err = gofmt.Run()
 	if err != nil {

commit 472caa7d3a5df65f77f279fa991726e6dd3a8df8
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Jul 4 09:18:24 2019 -0400

    14287: Install goimports if needed.
    
    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 c682024e3..17832311a 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -655,6 +655,7 @@ install_env() {
         cd "$GOPATH/src/git.curoverse.com/arvados.git"
         go get -v -d ...
         "$GOPATH/bin/govendor" sync
+        which goimports >/dev/null || go get golang.org/x/tools/cmd/goimports
     ) || fatal "Go setup failed"
 
     setup_virtualenv "$VENVDIR" --python python2.7

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


hooks/post-receive
--