diff --git a/config/blobs.yml b/config/blobs.yml index c85596c9a..0281ed6c4 100644 --- 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 index 211e618d3..a4dd8f80c 100644 --- 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 index dc3f8b700..27401e8a8 100644 --- 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 index c47e342a9..754fba615 100644 --- 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 index a02b66583..d3295d5b3 100644 --- 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 index d00fafff2..55ae63899 100644 --- 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 index d19b30a2b..02adf5223 100644 --- 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 deleted file mode 100644 index 52ba0d6a2..000000000 --- a/packages/golang1.12.4-windows/spec +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: golang1.12.4-windows - -dependencies: [] - -files: -- exiter.ps1 -- golang/go1.12.4.windows-amd64.zip diff --git a/packages/golang1.12.4/packaging b/packages/golang1.12.4/packaging deleted file mode 100644 index ca60a7647..000000000 --- a/packages/golang1.12.4/packaging +++ /dev/null @@ -1,4 +0,0 @@ -set -e - -tar xzf golang/go1.12.4.linux-amd64.tar.gz -cp -R go/* ${BOSH_INSTALL_TARGET} diff --git a/packages/golang1.12.4/spec b/packages/golang1.12.4/spec deleted file mode 100644 index ad11d0aa4..000000000 --- a/packages/golang1.12.4/spec +++ /dev/null @@ -1,5 +0,0 @@ ---- -name: golang1.12.4 - -files: -- golang/go1.12.4.linux-amd64.tar.gz diff --git a/packages/golang1.12.4-windows/packaging b/packages/golang1.13.1-windows/packaging similarity index 90% rename from packages/golang1.12.4-windows/packaging rename to packages/golang1.13.1-windows/packaging index adb32cca5..4279c1799 100644 --- a/packages/golang1.12.4-windows/packaging +++ b/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 new file mode 100644 index 000000000..4f541e571 --- /dev/null +++ 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 new file mode 100644 index 000000000..2607bafe7 --- /dev/null +++ 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 new file mode 100644 index 000000000..6073e4c2e --- /dev/null +++ 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 index c66444d09..ca2321833 100644 --- 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 index 489615c35..9011f4b18 100644 --- 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 index 2ee988132..f6ebe6d2f 100644 --- 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 index 0c41a589c..f1ee458f4 100644 --- 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 index a1fda034f..c767519f5 100644 --- 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 index f1f50d075..2dc5eac5b 100644 --- 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 index 456e5ebb6..657b4b1b2 100644 --- 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 index 6d392c78f..b333492a7 100644 --- 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 index 0761a1436..5326fe702 100644 --- 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 index bf5a4946d..1886a8d51 100644 --- 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 index 79cfdbf6f..e37ee0bdb 100644 --- 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 index 8855b6abc..be96b6dab 100644 --- 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 index 04c598dcb..21d8fbb44 100644 --- 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 index ac97486b0..3c8bc7902 100644 --- 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 index d02445837..9cf106e9e 100644 --- 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 index 9424452a6..61810c5bd 100644 --- 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 index 8bdc43236..76f91f0dd 100644 --- 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 index e2135dab8..f37397972 100644 --- 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 index f53f60120..b4dc918e5 100644 --- 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 index 63ddfb892..4e7e9b48a 100644 --- 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