diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6b2ff4275e21200dc53ee80b098bd5709449a6e..d412aa7ba948ca4092af1b5c859ea6330780499c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,8 +16,8 @@ default: git_default: "default" git_minimum: "v2.42.0" gitlab_dangerfiles: "4.5.1" - go_default: "1.22" - go_supported: [ "1.21", "1.22" ] + go_default: "1.22.1" + go_supported: [ "1.21", "1.22.1" ] macos: "macos-12-xcode-14" pgbouncer: "1.17.0" postgres_default: "12-alpine" diff --git a/.tool-versions b/.tool-versions index 9d2c042738e3a8376c83d5ba2bad96a9e17c0614..5175da87d83659df10518e3c9206d1ab49c4feab 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ # Versions of Gitaly dependencies managed by asdf. -golang 1.22.0 1.21.7 +golang 1.22.1 1.21.7 ruby 3.2.3 diff --git a/go.mod b/go.mod index 30fde85608951169c865d232aa6c2f3b5eb95ea4..b463ae2886771601bfd1847b08882c8820f098e7 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( golang.org/x/time v0.3.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 google.golang.org/grpc v1.60.1 - google.golang.org/protobuf v1.31.0 + google.golang.org/protobuf v1.33.0 ) require ( diff --git a/go.sum b/go.sum index 2c19a216af827c8b929e6e55c6c0e366b910c6df..66a73bcd17df7a01bc6c09d87dcc284d2df20248 100644 --- a/go.sum +++ b/go.sum @@ -1082,8 +1082,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/DataDog/dd-trace-go.v1 v1.32.0 h1:DkD0plWEVUB8v/Ru6kRBW30Hy/fRNBC8hPdcExuBZMc= gopkg.in/DataDog/dd-trace-go.v1 v1.32.0/go.mod h1:wRKMf/tRASHwH/UOfPQ3IQmVFhTz2/1a1/mpXoIjF54= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=