[Chore] Bump to Go 1.23 (#660)

* Bump to Go1.23 * fix(scripts workflow): Pull go version from src Selects the version of go to use from the src/go.mod file in the scripts workflow. --------- Co-authored-by: Carson Long <12767276+ctlong@users.noreply.github.com>
cloudfoundry · Jan 6, 2025 · 752e9de · 752e9de
1 parent 2b0704c
commit 752e9de
Show file tree

Hide file tree

Showing 30 changed files with 29 additions and 37 deletions.
diff --git a/.github/workflows/scripts.yml b/.github/workflows/scripts.yml
@@ -17,8 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
-          check-latest: true
+          go-version-file: "src/go.mod"
       - run: ./scripts/subtests/unit-test
 
   lint:
@@ -27,6 +26,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
-          check-latest: true
+          go-version-file: "src/go.mod"
       - run: ./scripts/subtests/lint
diff --git a/packages/binding-cache/packaging b/packages/binding-cache/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.23-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/binding-cache ./cmd/syslog-binding-cache
diff --git a/packages/binding-cache/spec b/packages/binding-cache/spec
@@ -2,7 +2,7 @@
 name: binding-cache
 
 dependencies:
-- golang-1.22-linux
+- golang-1.23-linux
 files:
 - cmd/syslog-binding-cache/**/*.go
 - pkg/**/*.go

diff --git a/packages/forwarder-agent-windows/packaging b/packages/forwarder-agent-windows/packaging
@@ -1,5 +1,5 @@
 . ./exiter.ps1
-. C:\var\vcap\packages\golang-1.22-windows\bosh\compile.ps1
+. C:\var\vcap\packages\golang-1.23-windows\bosh\compile.ps1
 $env:GOPATH="C:\var\vcap"
 
 $ErrorActionPreference = "Stop";

diff --git a/packages/forwarder-agent-windows/spec b/packages/forwarder-agent-windows/spec
@@ -2,7 +2,7 @@
 name: forwarder-agent-windows
 
 dependencies:
-- golang-1.22-windows
+- golang-1.23-windows
 
 files:
 - exiter.ps1

diff --git a/packages/forwarder-agent/packaging b/packages/forwarder-agent/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.23-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/forwarder-agent ./cmd/forwarder-agent
diff --git a/packages/forwarder-agent/spec b/packages/forwarder-agent/spec
@@ -2,7 +2,7 @@
 name: forwarder-agent
 
 dependencies:
-- golang-1.22-linux
+- golang-1.23-linux
 files:
 - cmd/forwarder-agent/**/*.go
 - pkg/**/*.go

diff --git a/packages/golang-1.22-linux/spec.lock b/packages/golang-1.22-linux/spec.lock
diff --git a/packages/golang-1.22-windows/spec.lock b/packages/golang-1.22-windows/spec.lock
diff --git a/packages/loggregator_agent/packaging b/packages/loggregator_agent/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.23-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/loggregator-agent ./cmd/loggregator-agent
diff --git a/packages/loggregator_agent/spec b/packages/loggregator_agent/spec
@@ -2,7 +2,7 @@
 name: loggregator_agent
 
 dependencies:
-- golang-1.22-linux
+- golang-1.23-linux
 files:
 - cmd/loggregator-agent/**/*.go
 - pkg/**/*.go

diff --git a/packages/loggregator_agent_windows/packaging b/packages/loggregator_agent_windows/packaging
@@ -1,5 +1,5 @@
 . ./exiter.ps1
-. C:\var\vcap\packages\golang-1.22-windows\bosh\compile.ps1
+. C:\var\vcap\packages\golang-1.23-windows\bosh\compile.ps1
 $env:GOPATH="C:\var\vcap"
 
 $ErrorActionPreference = "Stop";

diff --git a/packages/loggregator_agent_windows/spec b/packages/loggregator_agent_windows/spec
@@ -2,7 +2,7 @@
 name: loggregator_agent_windows
 
 dependencies:
-- golang-1.22-windows
+- golang-1.23-windows
 
 files:
 - exiter.ps1

diff --git a/packages/otel-collector-windows/packaging b/packages/otel-collector-windows/packaging
@@ -1,5 +1,5 @@
 . ./exiter.ps1
-. C:\var\vcap\packages\golang-1.22-windows\bosh\compile.ps1
+. C:\var\vcap\packages\golang-1.23-windows\bosh\compile.ps1
 $env:CGO_ENABLED="0"
 
 $ErrorActionPreference = "Stop";

diff --git a/packages/otel-collector-windows/spec b/packages/otel-collector-windows/spec
@@ -2,7 +2,7 @@
 name: otel-collector-windows
 
 dependencies:
-- golang-1.22-windows
+- golang-1.23-windows
 
 files:
 - exiter.ps1

diff --git a/packages/otel-collector/packaging b/packages/otel-collector/packaging
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e -x
 
-source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.23-linux/bosh/compile.env
 
 export CGO_ENABLED=0
 

diff --git a/packages/otel-collector/spec b/packages/otel-collector/spec
@@ -2,7 +2,7 @@
 name: otel-collector
 
 dependencies:
-- golang-1.22-linux
+- golang-1.23-linux
 
 files:
 - otel-collector-builder/**/*

diff --git a/packages/prom_scraper/packaging b/packages/prom_scraper/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.23-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/prom-scraper ./cmd/prom-scraper

diff --git a/packages/prom_scraper/spec b/packages/prom_scraper/spec
@@ -2,7 +2,7 @@
 name: prom_scraper
 
 dependencies:
-- golang-1.22-linux
+- golang-1.23-linux
 files:
 - cmd/prom-scraper/**/*.go
 - cmd/prom-scraper/get-metrics.sh

diff --git a/packages/prom_scraper_windows/packaging b/packages/prom_scraper_windows/packaging
@@ -1,5 +1,5 @@
 . ./exiter.ps1
-. C:\var\vcap\packages\golang-1.22-windows\bosh\compile.ps1
+. C:\var\vcap\packages\golang-1.23-windows\bosh\compile.ps1
 $env:GOPATH="C:\var\vcap"
 
 $ErrorActionPreference = "Stop";

diff --git a/packages/prom_scraper_windows/spec b/packages/prom_scraper_windows/spec
@@ -2,7 +2,7 @@
 name: prom_scraper_windows
 
 dependencies:
-- golang-1.22-windows
+- golang-1.23-windows
 
 files:
 - exiter.ps1

diff --git a/packages/syslog-agent-windows/packaging b/packages/syslog-agent-windows/packaging
@@ -1,5 +1,5 @@
 . ./exiter.ps1
-. C:\var\vcap\packages\golang-1.22-windows\bosh\compile.ps1
+. C:\var\vcap\packages\golang-1.23-windows\bosh\compile.ps1
 $env:GOPATH="C:\var\vcap"
 
 $ErrorActionPreference = "Stop";

diff --git a/packages/syslog-agent-windows/spec b/packages/syslog-agent-windows/spec
@@ -2,7 +2,7 @@
 name: syslog-agent-windows
 
 dependencies:
-- golang-1.22-windows
+- golang-1.23-windows
 
 files:
 - exiter.ps1

diff --git a/packages/syslog-agent/packaging b/packages/syslog-agent/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.23-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/syslog-agent ./cmd/syslog-agent
diff --git a/packages/syslog-agent/spec b/packages/syslog-agent/spec
@@ -2,7 +2,7 @@
 name: syslog-agent
 
 dependencies:
-- golang-1.22-linux
+- golang-1.23-linux
 files:
 - cmd/syslog-agent/**/*.go
 - pkg/**/*.go

diff --git a/packages/udp-forwarder/packaging b/packages/udp-forwarder/packaging
@@ -1,6 +1,6 @@
 set -ex
 
-source /var/vcap/packages/golang-1.22-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.23-linux/bosh/compile.env
 export GOPATH=/var/vcap
 
 go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/udp-forwarder ./cmd/udp-forwarder
diff --git a/packages/udp-forwarder/spec b/packages/udp-forwarder/spec
@@ -2,7 +2,7 @@
 name: udp-forwarder
 
 dependencies:
-- golang-1.22-linux
+- golang-1.23-linux
 files:
 - cmd/udp-forwarder/**/*.go
 - pkg/**/*.go

diff --git a/src/go.mod b/src/go.mod
@@ -1,8 +1,6 @@
 module code.cloudfoundry.org/loggregator-agent-release/src
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.0
 
 require (
 	code.cloudfoundry.org/go-batching v0.0.0-20241223135445-b8f45a03eb70

diff --git a/src/otel-collector-builder/go.mod b/src/otel-collector-builder/go.mod
@@ -1,6 +1,6 @@
 module code.cloudfoundry.org/loggregator-agent-release/src/otel-collector-builder
 
-go 1.22.0
+go 1.23.0
 
 require go.opentelemetry.io/collector/cmd/builder v0.103.0
 

diff --git a/src/otel-collector/go.mod b/src/otel-collector/go.mod
@@ -4,7 +4,7 @@ module code.cloudfoundry.org/loggregator-agent-release/src/otel-collector
 
 go 1.21.0
 
-toolchain go1.22.7
+toolchain go1.23.4
 
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.103.0