Skip to content

Commit

Permalink
chore: Bump to go1.21 (#419)
Browse files Browse the repository at this point in the history
* chore(src/go.mod): Bump to go1.21

* chore(packages): Use golang-1.21-linux

* chore(packages): Delete unneeded golang-1.20-linux package
  • Loading branch information
ctlong authored Jan 18, 2024
1 parent f0ca908 commit 8301fa6
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 11 deletions.
2 changes: 0 additions & 2 deletions packages/golang-1.20-linux/spec.lock

This file was deleted.

2 changes: 1 addition & 1 deletion packages/log-cache-cf-auth-proxy/packaging
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set -ex

source /var/vcap/packages/golang-1.20-linux/bosh/compile.env
source /var/vcap/packages/golang-1.21-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
2 changes: 1 addition & 1 deletion packages/log-cache-cf-auth-proxy/spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: log-cache-cf-auth-proxy

dependencies:
- golang-1.20-linux
- golang-1.21-linux

files:
- cmd/cf-auth-proxy/**/*.go
Expand Down
2 changes: 1 addition & 1 deletion packages/log-cache-gateway/packaging
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set -ex

source /var/vcap/packages/golang-1.20-linux/bosh/compile.env
source /var/vcap/packages/golang-1.21-linux/bosh/compile.env
export GOPATH=/var/vcap

VERSION=$(cat version)
Expand Down
2 changes: 1 addition & 1 deletion packages/log-cache-gateway/spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: log-cache-gateway

dependencies:
- golang-1.20-linux
- golang-1.21-linux

files:
- cmd/gateway/**/*.go
Expand Down
2 changes: 1 addition & 1 deletion packages/log-cache-syslog-server/packaging
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set -ex

source /var/vcap/packages/golang-1.20-linux/bosh/compile.env
source /var/vcap/packages/golang-1.21-linux/bosh/compile.env
export GOPATH=/var/vcap

go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/log-cache-syslog-server ./cmd/syslog-server
2 changes: 1 addition & 1 deletion packages/log-cache-syslog-server/spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: log-cache-syslog-server

dependencies:
- golang-1.20-linux
- golang-1.21-linux

files:
- cmd/syslog-server/**/*.go
Expand Down
2 changes: 1 addition & 1 deletion packages/log-cache/packaging
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set -ex

source /var/vcap/packages/golang-1.20-linux/bosh/compile.env
source /var/vcap/packages/golang-1.21-linux/bosh/compile.env
export GOPATH=/var/vcap

go build -mod=vendor -o ${BOSH_INSTALL_TARGET}/log-cache ./cmd/log-cache
2 changes: 1 addition & 1 deletion packages/log-cache/spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: log-cache

dependencies:
- golang-1.20-linux
- golang-1.21-linux

files:
- cmd/log-cache/**/*.go
Expand Down
2 changes: 1 addition & 1 deletion src/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module code.cloudfoundry.org/log-cache

go 1.20
go 1.21

require (
code.cloudfoundry.org/go-batching v0.0.0-20220601181205-303abfc14b83
Expand Down
6 changes: 6 additions & 0 deletions src/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
Expand Down Expand Up @@ -271,6 +272,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
Expand Down Expand Up @@ -312,6 +314,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/oklog/ulid v0.0.0-20170117200651-66bb6560562f/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
Expand All @@ -320,6 +323,7 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs=
github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
Expand Down Expand Up @@ -372,6 +376,7 @@ github.com/prometheus/prometheus v2.13.1+incompatible h1:2W7Aq4LQb71fD5QtFpATK3h
github.com/prometheus/prometheus v2.13.1+incompatible/go.mod h1:SgN99nHQ/tVJyAuyLKKz6i2j5cJx3eLy9MCRCPOXqUI=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
Expand Down Expand Up @@ -581,6 +586,7 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE=
gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
Expand Down

0 comments on commit 8301fa6

Please sign in to comment.