Bump golang to 1.13.1

[#168958394] Signed-off-by: Tom Chen <[email protected]>
cloudfoundry · Oct 4, 2019 · bb3bcb5 · bb3bcb5
1 parent d2987b9
commit bb3bcb5
Show file tree

Hide file tree

Showing 34 changed files with 53 additions and 62 deletions.
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -1,9 +1,9 @@
 ---
-golang/go1.12.4.linux-amd64.tar.gz:
-  size: 127928770
-  object_id: 50282fe8-2e60-41d1-6942-bf04ef9523b4
-  sha: sha256:d7d1f1f88ddfe55840712dc1747f37a790cbcaa448f6c9cf51bbe10aa65442f5
-golang/go1.12.4.windows-amd64.zip:
-  size: 141292610
-  object_id: 01bae496-b522-46ea-5cb9-59b23e4537d1
-  sha: sha256:25b043ebacca2fa2c87bbcd7463be5f34fbd225247c101888f81647fadbdfca0
+golang/go1.13.1.linux-amd64.tar.gz:
+  size: 120040373
+  object_id: d4557f97-71d6-4305-4372-650ed8f2829f
+  sha: sha256:94f874037b82ea5353f4061e543681a0e79657f787437974214629af8407d124
+golang/go1.13.1.windows-amd64.zip:
+  size: 133886068
+  object_id: 9057c20e-bed8-4331-643d-b98daf744ec1
+  sha: sha256:24cb08d369c1962cccacedc56fd79dc130f623b3b667a316554621ad6ac9b442
diff --git a/packages/binding-cache/packaging b/packages/binding-cache/packaging
@@ -3,10 +3,9 @@ set -e -x
 mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.12.4)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.13.1)
 export GOPATH=$BOSH_INSTALL_TARGET
 export PATH=$GOROOT/bin:$PATH
-export HOME=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/binding-cache code.cloudfoundry.org/loggregator-agent/cmd/syslog-binding-cache
 

diff --git a/packages/binding-cache/spec b/packages/binding-cache/spec
@@ -2,7 +2,7 @@
 name: binding-cache
 
 dependencies:
-- golang1.12.4
+- golang1.13.1
 
 files:
 - github.com/klauspost/cpuid/*

diff --git a/packages/forwarder-agent-windows/packaging b/packages/forwarder-agent-windows/packaging
@@ -8,10 +8,10 @@ if ((Get-Item $BOSH_INSTALL_TARGET).LinkType -ne "") {
   $BOSH_INSTALL_TARGET = (Get-Item $BOSH_INSTALL_TARGET).Target
 }
 
-$env:GOROOT="C:\var\vcap\packages\golang1.12.4-windows\go"
+$env:GOROOT="C:\var\vcap\packages\golang1.13.1-windows\go"
 $env:GOPATH="${BOSH_INSTALL_TARGET}"
 $env:PATH="${env:GOROOT}\bin;${env:PATH}"
-$env:HOME="C:\var\vcap"
+
 $pkg_name="forwarder-agent"
 $pkg_path="code.cloudfoundry.org/loggregator-agent/cmd/forwarder-agent"
 

diff --git a/packages/forwarder-agent-windows/spec b/packages/forwarder-agent-windows/spec
@@ -1,7 +1,7 @@
 ---
 name: forwarder-agent-windows
 dependencies:
-- golang1.12.4-windows
+- golang1.13.1-windows
 files:
 - github.com/klauspost/cpuid/*
 - github.com/klauspost/compress/flate/*

diff --git a/packages/forwarder-agent/packaging b/packages/forwarder-agent/packaging
@@ -3,10 +3,9 @@ set -e -x
 mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.12.4)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.13.1)
 export GOPATH=$BOSH_INSTALL_TARGET
 export PATH=$GOROOT/bin:$PATH
-export HOME=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/forwarder-agent code.cloudfoundry.org/loggregator-agent/cmd/forwarder-agent
 

diff --git a/packages/forwarder-agent/spec b/packages/forwarder-agent/spec
@@ -2,7 +2,7 @@
 name: forwarder-agent
 
 dependencies:
-- golang1.12.4
+- golang1.13.1
 
 files:
 - github.com/klauspost/cpuid/*

diff --git a/packages/golang1.12.4-windows/spec b/packages/golang1.12.4-windows/spec
diff --git a/packages/golang1.12.4/packaging b/packages/golang1.12.4/packaging
diff --git a/packages/golang1.12.4/spec b/packages/golang1.12.4/spec
diff --git a/packages/golang1.12.4-windows/packaging → packages/golang1.13.1-windows/packaging b/packages/golang1.12.4-windows/packaging → packages/golang1.13.1-windows/packaging
@@ -1,6 +1,6 @@
 . ./exiter.ps1
 
-$GOLANG_ZIP="golang/go1.12.4.windows-amd64.zip"
+$GOLANG_ZIP="golang/go1.13.1.windows-amd64.zip"
 try
 {
     Add-Type -AssemblyName System.IO.Compression.FileSystem

diff --git a/packages/golang1.13.1-windows/spec b/packages/golang1.13.1-windows/spec
@@ -0,0 +1,8 @@
+---
+name: golang1.13.1-windows
+
+dependencies: []
+
+files:
+- exiter.ps1
+- golang/go1.13.1.windows-amd64.zip
diff --git a/packages/golang1.13.1/packaging b/packages/golang1.13.1/packaging
@@ -0,0 +1,4 @@
+set -e
+
+tar xzf golang/go1.13.1.linux-amd64.tar.gz
+cp -R go/* ${BOSH_INSTALL_TARGET}
diff --git a/packages/golang1.13.1/spec b/packages/golang1.13.1/spec
@@ -0,0 +1,5 @@
+---
+name: golang1.13.1
+
+files:
+- golang/go1.13.1.linux-amd64.tar.gz
diff --git a/packages/loggregator_agent/packaging b/packages/loggregator_agent/packaging
@@ -3,10 +3,9 @@ set -e -x
 mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.12.4)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.13.1)
 export GOPATH=$BOSH_INSTALL_TARGET
 export PATH=$GOROOT/bin:$PATH
-export HOME=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/loggregator-agent code.cloudfoundry.org/loggregator-agent/cmd/agent
 

diff --git a/packages/loggregator_agent/spec b/packages/loggregator_agent/spec
@@ -1,7 +1,7 @@
 ---
 name: loggregator_agent
 dependencies:
-- golang1.12.4
+- golang1.13.1
 files:
 - code.cloudfoundry.org/go-batching/*.go # gosub
 - code.cloudfoundry.org/go-diodes/*.go # gosub

diff --git a/packages/loggregator_agent_windows/packaging b/packages/loggregator_agent_windows/packaging
@@ -8,7 +8,7 @@ if ((Get-Item $BOSH_INSTALL_TARGET).LinkType -ne "") {
   $BOSH_INSTALL_TARGET = (Get-Item $BOSH_INSTALL_TARGET).Target
 }
 
-$env:GOROOT="C:\var\vcap\packages\golang1.12.4-windows\go"
+$env:GOROOT="C:\var\vcap\packages\golang1.13.1-windows\go"
 $env:GOPATH="${BOSH_INSTALL_TARGET}"
 $env:PATH="${env:GOROOT}\bin;${env:PATH}"
 $env:HOME="C:\var\vcap"

diff --git a/packages/loggregator_agent_windows/spec b/packages/loggregator_agent_windows/spec
@@ -1,7 +1,7 @@
 ---
 name: loggregator_agent_windows
 dependencies:
-- golang1.12.4-windows
+- golang1.13.1-windows
 files:
 - exiter.ps1
 - code.cloudfoundry.org/go-batching/*.go # gosub

diff --git a/packages/metric-scraper/packaging b/packages/metric-scraper/packaging
@@ -3,10 +3,9 @@ set -e -x
 mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.12.4)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.13.1)
 export GOPATH=$BOSH_INSTALL_TARGET
 export PATH=$GOROOT/bin:$PATH
-export HOME=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/metric-scraper code.cloudfoundry.org/loggregator-agent/cmd/metric-scraper
 

diff --git a/packages/metric-scraper/spec b/packages/metric-scraper/spec
@@ -1,7 +1,7 @@
 ---
 name: metric-scraper
 dependencies:
-- golang1.12.4
+- golang1.13.1
 files:
 - code.cloudfoundry.org/go-diodes/*.go # gosub
 - code.cloudfoundry.org/go-envstruct/*.go # gosub

diff --git a/packages/prom_scraper/packaging b/packages/prom_scraper/packaging
@@ -3,10 +3,9 @@ set -e -x
 mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.12.4)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.13.1)
 export GOPATH=$BOSH_INSTALL_TARGET
 export PATH=$GOROOT/bin:$PATH
-export HOME=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/prom-scraper code.cloudfoundry.org/loggregator-agent/cmd/prom-scraper
 

diff --git a/packages/prom_scraper/spec b/packages/prom_scraper/spec
@@ -1,7 +1,7 @@
 ---
 name: prom_scraper
 dependencies:
-- golang1.12.4
+- golang1.13.1
 files:
 - code.cloudfoundry.org/go-diodes/*.go # gosub
 - code.cloudfoundry.org/go-envstruct/*.go # gosub

diff --git a/packages/prom_scraper_windows/packaging b/packages/prom_scraper_windows/packaging
@@ -8,7 +8,7 @@ if ((Get-Item $BOSH_INSTALL_TARGET).LinkType -ne "") {
   $BOSH_INSTALL_TARGET = (Get-Item $BOSH_INSTALL_TARGET).Target
 }
 
-$env:GOROOT="C:\var\vcap\packages\golang1.12.4-windows\go"
+$env:GOROOT="C:\var\vcap\packages\golang1.13.1-windows\go"
 $env:GOPATH="${BOSH_INSTALL_TARGET}"
 $env:PATH="${env:GOROOT}\bin;${env:PATH}"
 $env:HOME="C:\var\vcap"

diff --git a/packages/prom_scraper_windows/spec b/packages/prom_scraper_windows/spec
@@ -1,7 +1,7 @@
 ---
 name: prom_scraper_windows
 dependencies:
-- golang1.12.4-windows
+- golang1.13.1-windows
 files:
 - exiter.ps1
 

diff --git a/packages/syslog-agent-windows/packaging b/packages/syslog-agent-windows/packaging
@@ -8,7 +8,7 @@ if ((Get-Item $BOSH_INSTALL_TARGET).LinkType -ne "") {
   $BOSH_INSTALL_TARGET = (Get-Item $BOSH_INSTALL_TARGET).Target
 }
 
-$env:GOROOT="C:\var\vcap\packages\golang1.12.4-windows\go"
+$env:GOROOT="C:\var\vcap\packages\golang1.13.1-windows\go"
 $env:GOPATH="${BOSH_INSTALL_TARGET}"
 $env:PATH="${env:GOROOT}\bin;${env:PATH}"
 $env:HOME="C:\var\vcap"

diff --git a/packages/syslog-agent-windows/spec b/packages/syslog-agent-windows/spec
@@ -1,7 +1,7 @@
 ---
 name: syslog-agent-windows
 dependencies:
-- golang1.12.4-windows
+- golang1.13.1-windows
 files:
 - exiter.ps1
 - github.com/klauspost/cpuid/*

diff --git a/packages/syslog-agent/packaging b/packages/syslog-agent/packaging
@@ -3,10 +3,9 @@ set -e -x
 mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.12.4)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.13.1)
 export GOPATH=$BOSH_INSTALL_TARGET
 export PATH=$GOROOT/bin:$PATH
-export HOME=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/syslog-agent code.cloudfoundry.org/loggregator-agent/cmd/syslog-agent
 

diff --git a/packages/syslog-agent/spec b/packages/syslog-agent/spec
@@ -2,7 +2,7 @@
 name: syslog-agent
 
 dependencies:
-- golang1.12.4
+- golang1.13.1
 
 files:
 - github.com/klauspost/cpuid/*

diff --git a/packages/system-metrics-agent-windows/packaging b/packages/system-metrics-agent-windows/packaging
@@ -8,10 +8,9 @@ if ((Get-Item $BOSH_INSTALL_TARGET).LinkType -ne "") {
   $BOSH_INSTALL_TARGET = (Get-Item $BOSH_INSTALL_TARGET).Target
 }
 
-$env:GOROOT="C:\var\vcap\packages\golang1.12.4-windows\go"
+$env:GOROOT="C:\var\vcap\packages\golang1.13.1-windows\go"
 $env:GOPATH="${BOSH_INSTALL_TARGET}"
 $env:PATH="${env:GOROOT}\bin;${env:PATH}"
-$env:HOME="C:\var\vcap"
 $pkg_name="system-metrics-agent"
 $pkg_path="code.cloudfoundry.org/loggregator-agent/cmd/system-metrics-agent"
 

diff --git a/packages/system-metrics-agent-windows/spec b/packages/system-metrics-agent-windows/spec
@@ -1,7 +1,7 @@
 ---
 name: system-metrics-agent-windows
 dependencies:
-- golang1.12.4-windows
+- golang1.13.1-windows
 files:
 - golang.org/x/sys/windows/*
 - exiter.ps1

diff --git a/packages/system-metrics-agent/packaging b/packages/system-metrics-agent/packaging
@@ -3,10 +3,9 @@ set -e -x
 mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.12.4)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.13.1)
 export GOPATH=$BOSH_INSTALL_TARGET
 export PATH=$GOROOT/bin:$PATH
-export HOME=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/system-metrics-agent code.cloudfoundry.org/loggregator-agent/cmd/system-metrics-agent
 

diff --git a/packages/system-metrics-agent/spec b/packages/system-metrics-agent/spec
@@ -2,7 +2,7 @@
 name: system-metrics-agent
 
 dependencies:
-- golang1.12.4
+- golang1.13.1
 
 files:
 # We need all the files from these directories. Not just Go source files.

diff --git a/packages/udp-forwarder/packaging b/packages/udp-forwarder/packaging
@@ -3,10 +3,9 @@ set -e -x
 mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.12.4)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.13.1)
 export GOPATH=$BOSH_INSTALL_TARGET
 export PATH=$GOROOT/bin:$PATH
-export HOME=/var/vcap
 
 go build -o ${BOSH_INSTALL_TARGET}/udp-forwarder code.cloudfoundry.org/loggregator-agent/cmd/udp-forwarder
 

diff --git a/packages/udp-forwarder/spec b/packages/udp-forwarder/spec
@@ -2,7 +2,7 @@
 name: udp-forwarder
 
 dependencies:
-- golang1.12.4
+- golang1.13.1
 
 files:
 - code.cloudfoundry.org/go-diodes/*.go # gosub