Bump golang to 1.13

Micah Young · Micah Young · commit 1592c01dd79f · 2019-10-07T11:30:09.000-04:00
diff --git a/.final_builds/packages/golang-1.13-darwin/index.yml b/.final_builds/packages/golang-1.13-darwin/index.yml
@@ -0,0 +1,6 @@
+builds:
+  85ce18fed88a80406c39632edd58587e63f71eae0895357d7c61a5d69b62193c:
+    version: 85ce18fed88a80406c39632edd58587e63f71eae0895357d7c61a5d69b62193c
+    blobstore_id: 57403cbd-6569-49e9-44c6-87cd725ccb62
+    sha1: sha256:b287896eaeb92f54c66eb855f52798097d60256d3f6a829d753405794e5326d1
+format-version: "2"
diff --git a/.final_builds/packages/golang-1.13-linux/index.yml b/.final_builds/packages/golang-1.13-linux/index.yml
@@ -0,0 +1,6 @@
+builds:
+  90d508f7ad90706425b804c6de711d88ecff40b95cf0edbe2a42181ce2e26c40:
+    version: 90d508f7ad90706425b804c6de711d88ecff40b95cf0edbe2a42181ce2e26c40
+    blobstore_id: 302ba43c-0707-45ca-68a2-03e8fee350b4
+    sha1: sha256:827a74ac02868dbee1da9fa37c5876cd66f341034a554c55dfa1424c8994fac1
+format-version: "2"
diff --git a/packages/golang-1.11-darwin/spec.lock b/packages/golang-1.11-darwin/spec.lock
diff --git a/packages/golang-1.11-linux/spec.lock b/packages/golang-1.11-linux/spec.lock
diff --git a/packages/golang-1.13-darwin/spec.lock b/packages/golang-1.13-darwin/spec.lock
@@ -0,0 +1,2 @@
+name: golang-1.13-darwin
+fingerprint: 85ce18fed88a80406c39632edd58587e63f71eae0895357d7c61a5d69b62193c
diff --git a/packages/golang-1.13-linux/spec.lock b/packages/golang-1.13-linux/spec.lock
@@ -0,0 +1,2 @@
+name: golang-1.13-linux
+fingerprint: 90d508f7ad90706425b804c6de711d88ecff40b95cf0edbe2a42181ce2e26c40
diff --git a/packages/vmrun_cpi/packaging b/packages/vmrun_cpi/packaging
@@ -2,9 +2,9 @@ set -e -x
 
 platform=$(uname | tr '[:upper:]' '[:lower:]')
 if [ -z "$BOSH_PACKAGES_DIR" ]; then
-	pkg_dir=$(readlink -nf /var/vcap/packages/golang-1.11-${platform})
+	pkg_dir=$(readlink -nf /var/vcap/packages/golang-1.13-${platform})
 else
-	pkg_dir=$BOSH_PACKAGES_DIR/golang-1.11-${platform}
+	pkg_dir=$BOSH_PACKAGES_DIR/golang-1.13-${platform}
 fi
 
 source ${pkg_dir}/bosh/compile.env.generic
@@ -15,22 +15,21 @@ mkdir -p $BOSH_INSTALL_TARGET/bin
 
 VERSION=$(cat bosh-vmrun-cpi/VERSION)
 
+export GOCACHE=$GOROOT/cache
 export GOARCH=amd64
+
 export GOOS=darwin
 export GOTOOLDIR=$GOROOT/pkg/darwin_amd64
 
 go build -ldflags "-X main.version=$VERSION" -o $BOSH_INSTALL_TARGET/bin/cpi-darwin src/bosh-vmrun-cpi/cmd/cpi/*.go
 go build -ldflags "-X main.version=$VERSION" -o $BOSH_INSTALL_TARGET/bin/installer-darwin src/bosh-vmrun-cpi/cmd/installer/*.go
 
-export GOARCH=amd64
 export GOOS=linux
 export GOTOOLDIR=$GOROOT/pkg/linux_amd64
 
-
 go build -ldflags "-X main.version=$VERSION" -o $BOSH_INSTALL_TARGET/bin/cpi-linux src/bosh-vmrun-cpi/cmd/cpi/*.go
 go build -ldflags "-X main.version=$VERSION" -o $BOSH_INSTALL_TARGET/bin/installer-linux src/bosh-vmrun-cpi/cmd/installer/*.go
 
-export GOARCH=amd64
 export GOOS=windows
 export GOTOOLDIR=$GOROOT/pkg/windows_amd64
 
diff --git a/packages/vmrun_cpi/spec b/packages/vmrun_cpi/spec
@@ -2,8 +2,8 @@
 name: vmrun_cpi
 
 dependencies:
-- golang-1.11-linux
-- golang-1.11-darwin
+- golang-1.13-linux
+- golang-1.13-darwin
 
 files:
 - "**/*"
diff --git a/src/bosh-vmrun-cpi/VERSION b/src/bosh-vmrun-cpi/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+name: golang-1.13-darwin`
	`2`	`+fingerprint: 85ce18fed88a80406c39632edd58587e63f71eae0895357d7c61a5d69b62193c`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+name: golang-1.13-linux`
	`2`	`+fingerprint: 90d508f7ad90706425b804c6de711d88ecff40b95cf0edbe2a42181ce2e26c40`