From 0ba9765a5afdd8e65ccf5331f17ce77b6e082261 Mon Sep 17 00:00:00 2001 From: Matthew Kocher Date: Tue, 23 Jul 2024 20:43:30 +0000 Subject: [PATCH] Bump to Go1.22 Signed-off-by: Ausaf Ahmed Co-authored-by: Ausaf Ahmed --- packages/golang-1.21-linux/spec.lock | 2 -- packages/log-cache-cf-auth-proxy/packaging | 2 +- packages/log-cache-cf-auth-proxy/spec | 2 +- packages/log-cache-gateway/packaging | 2 +- packages/log-cache-gateway/spec | 2 +- packages/log-cache-syslog-server/packaging | 2 +- packages/log-cache-syslog-server/spec | 2 +- packages/log-cache/packaging | 2 +- packages/log-cache/spec | 2 +- src/go.mod | 4 +--- 10 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 packages/golang-1.21-linux/spec.lock diff --git a/packages/golang-1.21-linux/spec.lock b/packages/golang-1.21-linux/spec.lock deleted file mode 100644 index 2d0f6427f..000000000 --- a/packages/golang-1.21-linux/spec.lock +++ /dev/null @@ -1,2 +0,0 @@ -name: golang-1.21-linux -fingerprint: 55147e471cfe150f63898ed1ae13b6cb48dac8f198d415319b14572ea7a55443 diff --git a/packages/log-cache-cf-auth-proxy/packaging b/packages/log-cache-cf-auth-proxy/packaging index 11727f98c..6945f4dfa 100644 --- a/packages/log-cache-cf-auth-proxy/packaging +++ b/packages/log-cache-cf-auth-proxy/packaging @@ -1,6 +1,6 @@ set -ex -source /var/vcap/packages/golang-1.21-linux/bosh/compile.env +source /var/vcap/packages/golang-1.22-linux/bosh/compile.env export GOPATH=/var/vcap go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/log-cache-cf-auth-proxy ./cmd/cf-auth-proxy diff --git a/packages/log-cache-cf-auth-proxy/spec b/packages/log-cache-cf-auth-proxy/spec index 89258f533..b2dc085ca 100644 --- a/packages/log-cache-cf-auth-proxy/spec +++ b/packages/log-cache-cf-auth-proxy/spec @@ -2,7 +2,7 @@ name: log-cache-cf-auth-proxy dependencies: -- golang-1.21-linux +- golang-1.22-linux files: - cmd/cf-auth-proxy/**/*.go diff --git a/packages/log-cache-gateway/packaging b/packages/log-cache-gateway/packaging index e7912a37e..05372dc47 100644 --- a/packages/log-cache-gateway/packaging +++ b/packages/log-cache-gateway/packaging @@ -1,6 +1,6 @@ set -ex -source /var/vcap/packages/golang-1.21-linux/bosh/compile.env +source /var/vcap/packages/golang-1.22-linux/bosh/compile.env export GOPATH=/var/vcap VERSION=$(cat version) diff --git a/packages/log-cache-gateway/spec b/packages/log-cache-gateway/spec index e55d634bd..d2bf6e3c4 100644 --- a/packages/log-cache-gateway/spec +++ b/packages/log-cache-gateway/spec @@ -2,7 +2,7 @@ name: log-cache-gateway dependencies: -- golang-1.21-linux +- golang-1.22-linux files: - cmd/gateway/**/*.go diff --git a/packages/log-cache-syslog-server/packaging b/packages/log-cache-syslog-server/packaging index b8021a707..3e86a38af 100644 --- a/packages/log-cache-syslog-server/packaging +++ b/packages/log-cache-syslog-server/packaging @@ -1,6 +1,6 @@ set -ex -source /var/vcap/packages/golang-1.21-linux/bosh/compile.env +source /var/vcap/packages/golang-1.22-linux/bosh/compile.env export GOPATH=/var/vcap go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/log-cache-syslog-server ./cmd/syslog-server diff --git a/packages/log-cache-syslog-server/spec b/packages/log-cache-syslog-server/spec index f89cadb26..bacb28e3b 100644 --- a/packages/log-cache-syslog-server/spec +++ b/packages/log-cache-syslog-server/spec @@ -2,7 +2,7 @@ name: log-cache-syslog-server dependencies: -- golang-1.21-linux +- golang-1.22-linux files: - cmd/syslog-server/**/*.go diff --git a/packages/log-cache/packaging b/packages/log-cache/packaging index cb481e0c9..bbf5b531f 100644 --- a/packages/log-cache/packaging +++ b/packages/log-cache/packaging @@ -1,6 +1,6 @@ set -ex -source /var/vcap/packages/golang-1.21-linux/bosh/compile.env +source /var/vcap/packages/golang-1.22-linux/bosh/compile.env export GOPATH=/var/vcap go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/log-cache ./cmd/log-cache diff --git a/packages/log-cache/spec b/packages/log-cache/spec index 50289639f..81adaeec5 100644 --- a/packages/log-cache/spec +++ b/packages/log-cache/spec @@ -2,7 +2,7 @@ name: log-cache dependencies: -- golang-1.21-linux +- golang-1.22-linux files: - cmd/log-cache/**/*.go diff --git a/src/go.mod b/src/go.mod index aba718586..44526a916 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,8 +1,6 @@ module code.cloudfoundry.org/log-cache -go 1.21.0 - -toolchain go1.21.12 +go 1.22.0 require ( code.cloudfoundry.org/go-batching v0.0.0-20240604201829-c8533406dd64