Minor change to build.py

build.py

@@ -119,21 +119,16 @@ def package_scripts(build_root):
 def run_generate():
     print "Running generate..."
     run("go get github.com/gogo/protobuf/protoc-gen-gogo")
-    command = "go generate ./..."
-    code = os.system(command)
-    if code != 0:
-        print "Generate Failed"
-        return False
-    else:
-        print "Generate Succeeded"
+    run("go generate ./...")
+    print "Generate succeeded."
     return True
 
 def go_get(branch, update=False, no_stash=False):
     get_command = ""
     if update:
-        get_command += "go get -u -f -d ./..."
+        get_command += "go get -t -u -f -d ./..."
     else:
-        get_command += "go get -d ./..."
+        get_command += "go get -t -d ./..."
 
     # 'go get' switches to master, so stash what we currently have
     changes = run("git status --porcelain").strip()
@@ -180,6 +175,8 @@ def run(command, allow_failure=False, shell=False):
             out = subprocess.check_output(command, stderr=subprocess.STDOUT, shell=shell)
         else:
             out = subprocess.check_output(command.split(), stderr=subprocess.STDOUT)
+        if debug:
+            print "[DEBUG] command output: \n{}\n".format(out)
     except subprocess.CalledProcessError as e:
         print ""
         print ""
@@ -346,14 +343,9 @@ def upload_packages(packages, bucket_name=None, nightly=False):
     return 0
 
 def run_tests(race, parallel, timeout, no_vet):
-    print "Retrieving Go dependencies...",
-    get_command = "go get -d -t ./..."
-    sys.stdout.flush()
-    run(get_command)
-    get_command = "go get golang.org/x/tools/cmd/vet"
+    print "Downloading vet tool..."
     sys.stdout.flush()
-    run(get_command)
-    print "done."
+    run("go get golang.org/x/tools/cmd/vet")
     print "Running tests:"
     print "\tRace: ", race
     if parallel is not None:
@@ -450,7 +442,7 @@ def build(version=None,
             elif arch == "armhf" or arch == "arm":
                 build_command += "GOARM=6 "
             elif arch == "arm64":
-                build_command += "GOARM=arm64 "
+                build_command += "GOARM=7 "
             else:
                 print "!! Invalid ARM architecture specifed: {}".format(arch)
                 print "Please specify either 'armel', 'armhf', or 'arm64'"
@@ -797,7 +789,8 @@ def main():
             return 1
 
     if run_get:
-        go_get(branch, update=update, no_stash=no_stash)
+        if not go_get(branch, update=update, no_stash=no_stash):
+            return 1
 
     if test:
         if not run_tests(race, parallel, timeout, no_vet):

circle.yml

@@ -20,4 +20,4 @@ deployment:
     release:
         tag: /v[0-9]+(\.[0-9]+){2}(-rc[0-9]+)?/
         commands:
-            - ./build.sh --clean --generate --package --upload --platform=all --arch=all
+            - ./build.sh --debug --clean --generate --package --upload --platform=all --arch=all

test.sh

@@ -129,24 +129,24 @@ fi
 case $ENVIRONMENT_INDEX in
     0)
         # 64 bit tests
-        run_test_docker Dockerfile_build_ubuntu64 test_64bit --test --generate --no-stash
+        run_test_docker Dockerfile_build_ubuntu64 test_64bit --debug --test --generate --no-stash
         rc=$?
         ;;
     1)
         # 64 bit race tests
         GORACE="halt_on_error=1"
-        run_test_docker Dockerfile_build_ubuntu64 test_64bit_race --test --generate --no-stash --race
+        run_test_docker Dockerfile_build_ubuntu64 test_64bit_race --debug --test --generate --no-stash --race
         rc=$?
         ;;
     2)
         # 32 bit tests
-        run_test_docker Dockerfile_build_ubuntu32 test_32bit --test --generate --no-stash
+        run_test_docker Dockerfile_build_ubuntu32 test_32bit --debug --test --generate --no-stash
         rc=$?
         ;;
     3)
         # 64 bit tests on golang go1.6
         GO_CHECKOUT=go1.6rc2
-        run_test_docker Dockerfile_build_ubuntu64_git test_64bit_go1.6 --test --generate --no-stash
+        run_test_docker Dockerfile_build_ubuntu64_git test_64bit_go1.6 --debug --test --generate --no-stash
         rc=$?
         ;;
     "save")