Merge branch 'master' into update-spire-agent-docs

dgervais · Dec 19, 2018 · f084e77 · f084e77
2 parents 0811653 + 6687457
commit f084e77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.11.2
+1.11.4
diff --git a/build.sh b/build.sh
@@ -28,7 +28,7 @@ declare -r BUILD_DIR=${BUILD_DIR:-$PWD/.build-${OS1}-${ARCH1}}
 declare -r BUILD_CACHE=${BUILD_CACHE:-$PWD/.cache}
 
 # versioned binaries that we need for builds
-declare -r GO_VERSION=${GO_VERSION:-1.11.2}
+declare -r GO_VERSION=${GO_VERSION:-1.11.4}
 declare -r GO_URL="https://storage.googleapis.com/golang"
 declare -r GO_TGZ="go${GO_VERSION}.${OS1}-${ARCH2}.tar.gz"
 declare -r PROTOBUF_VERSION=${PROTOBUF_VERSION:-3.3.0}