Skip to content

Commit 5bc2925

Browse files
matthewmcneelymatthewmcneely
authored
chore(ci): update go toolchain version (#9568)
**Description** This PR updates the go version to 1.25.6. Subsequently, a number of module dependencies are also updated. This action along with some changes to our Dockerfile removes all high and medium CVEs (according to docker scout). **Checklist** - [x] The PR title follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) syntax, leading with `fix:`, `feat:`, `chore:`, `ci:`, etc. - [x] Code compiles correctly and linting (via trunk) passes locally
1 parent 96f976d commit 5bc2925

File tree

4 files changed

+163
-178
lines changed

4 files changed

+163
-178
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Used only by the (currently disabled) nightly build workflow
2+
13
###################### Stage I ######################
24
FROM golang:1.25.0 AS builder
35
RUN apt-get update && apt-get install -y --no-install-recommends \

‎contrib/Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2424
libjemalloc-dev \
2525
less \
2626
sysstat \
27+
gnupg \
28+
gnupg2 \
29+
tar \
30+
libpam0g \
2731
&& rm -rf /var/lib/apt/lists/*
2832

2933
ADD linux /usr/local/bin

‎go.mod‎

Lines changed: 51 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/dgraph-io/dgraph/v25
22

3-
go 1.24.3
3+
go 1.25.6
44

55
require (
66
contrib.go.opencensus.io/exporter/prometheus v0.4.2
7-
github.com/HdrHistogram/hdrhistogram-go v1.1.2
7+
github.com/HdrHistogram/hdrhistogram-go v1.2.0
88
github.com/IBM/sarama v1.46.3
99
github.com/Masterminds/semver/v3 v3.4.0
10-
github.com/blevesearch/bleve/v2 v2.5.4
11-
github.com/dgraph-io/badger/v4 v4.8.0
10+
github.com/blevesearch/bleve/v2 v2.5.7
11+
github.com/dgraph-io/badger/v4 v4.9.0
1212
github.com/dgraph-io/dgo/v250 v250.0.0
1313
github.com/dgraph-io/gqlgen v0.13.2
1414
github.com/dgraph-io/gqlparser/v2 v2.2.2
@@ -23,7 +23,7 @@ require (
2323
github.com/go-jose/go-jose/v4 v4.1.3
2424
github.com/go-sql-driver/mysql v1.9.3
2525
github.com/golang-jwt/jwt/v5 v5.3.0
26-
github.com/golang/geo v0.0.0-20251030142647-5906ab3d21fa
26+
github.com/golang/geo v0.0.0-20251229110840-fd652594c94c
2727
github.com/golang/glog v1.2.5
2828
github.com/golang/snappy v1.0.0
2929
github.com/google/codesearch v1.2.0
@@ -32,43 +32,43 @@ require (
3232
github.com/gorilla/websocket v1.5.3
3333
github.com/graph-gophers/graphql-go v1.8.0
3434
github.com/hashicorp/vault/api v1.22.0
35-
github.com/klauspost/compress v1.18.1
36-
github.com/mark3labs/mcp-go v0.43.0
37-
github.com/minio/minio-go/v7 v7.0.97
35+
github.com/klauspost/compress v1.18.2
36+
github.com/mark3labs/mcp-go v0.43.2
37+
github.com/minio/minio-go/v7 v7.0.98
3838
github.com/paulmach/go.geojson v1.5.0
3939
github.com/pkg/errors v0.9.1
4040
github.com/pkg/profile v1.7.0
4141
github.com/prometheus/client_golang v1.23.2
4242
github.com/soheilhy/cmux v0.1.5
4343
github.com/spf13/cast v1.10.0
44-
github.com/spf13/cobra v1.10.1
44+
github.com/spf13/cobra v1.10.2
4545
github.com/spf13/pflag v1.0.10
4646
github.com/spf13/viper v1.21.0
4747
github.com/stretchr/testify v1.11.1
4848
github.com/twpayne/go-geom v1.6.1
4949
github.com/viterin/vek v0.4.3
5050
github.com/xdg/scram v1.0.5
51-
go.etcd.io/etcd/raft/v3 v3.5.24
51+
go.etcd.io/etcd/raft/v3 v3.5.26
5252
go.opencensus.io v0.24.0
53-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
54-
go.opentelemetry.io/contrib/zpages v0.63.0
55-
go.opentelemetry.io/otel v1.38.0
56-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
57-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0
58-
go.opentelemetry.io/otel/sdk v1.38.0
59-
go.opentelemetry.io/otel/trace v1.38.0
60-
go.uber.org/zap v1.27.0
61-
golang.org/x/crypto v0.45.0
62-
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
63-
golang.org/x/mod v0.29.0
64-
golang.org/x/net v0.47.0
65-
golang.org/x/sync v0.18.0
66-
golang.org/x/sys v0.38.0
67-
golang.org/x/term v0.37.0
68-
golang.org/x/text v0.31.0
69-
golang.org/x/tools v0.38.0
70-
google.golang.org/grpc v1.76.0
71-
google.golang.org/protobuf v1.36.10
53+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.64.0
54+
go.opentelemetry.io/contrib/zpages v0.64.0
55+
go.opentelemetry.io/otel v1.39.0
56+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0
57+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0
58+
go.opentelemetry.io/otel/sdk v1.39.0
59+
go.opentelemetry.io/otel/trace v1.39.0
60+
go.uber.org/zap v1.27.1
61+
golang.org/x/crypto v0.47.0
62+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
63+
golang.org/x/mod v0.32.0
64+
golang.org/x/net v0.49.0
65+
golang.org/x/sync v0.19.0
66+
golang.org/x/sys v0.40.0
67+
golang.org/x/term v0.39.0
68+
golang.org/x/text v0.33.0
69+
golang.org/x/tools v0.41.0
70+
google.golang.org/grpc v1.78.0
71+
google.golang.org/protobuf v1.36.11
7272
gopkg.in/yaml.v3 v3.0.1
7373
)
7474

@@ -78,8 +78,8 @@ require (
7878
github.com/agnivade/levenshtein v1.2.1 // indirect
7979
github.com/bahlo/generic-list-go v0.2.0 // indirect
8080
github.com/beorn7/perks v1.0.1 // indirect
81-
github.com/bits-and-blooms/bitset v1.22.0 // indirect
82-
github.com/blevesearch/bleve_index_api v1.2.10 // indirect
81+
github.com/bits-and-blooms/bitset v1.24.4 // indirect
82+
github.com/blevesearch/bleve_index_api v1.3.0 // indirect
8383
github.com/blevesearch/geo v0.2.4 // indirect
8484
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
8585
github.com/blevesearch/segment v0.9.1 // indirect
@@ -105,13 +105,13 @@ require (
105105
github.com/go-ini/ini v1.67.0 // indirect
106106
github.com/go-logr/logr v1.4.3 // indirect
107107
github.com/go-logr/stdr v1.2.2 // indirect
108-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
108+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
109109
github.com/gogo/protobuf v1.3.2 // indirect
110110
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
111111
github.com/golang/protobuf v1.5.4 // indirect
112-
github.com/google/flatbuffers v25.2.10+incompatible // indirect
113-
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
114-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
112+
github.com/google/flatbuffers v25.12.19+incompatible // indirect
113+
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
114+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.4 // indirect
115115
github.com/hashicorp/errwrap v1.1.0 // indirect
116116
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
117117
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -130,10 +130,10 @@ require (
130130
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
131131
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
132132
github.com/json-iterator/go v1.1.12 // indirect
133-
github.com/klauspost/cpuid/v2 v2.2.11 // indirect
133+
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
134134
github.com/klauspost/crc32 v1.3.0 // indirect
135-
github.com/mailru/easyjson v0.7.7 // indirect
136-
github.com/minio/crc64nvme v1.1.0 // indirect
135+
github.com/mailru/easyjson v0.9.1 // indirect
136+
github.com/minio/crc64nvme v1.1.1 // indirect
137137
github.com/minio/md5-simd v1.1.2 // indirect
138138
github.com/mitchellh/go-homedir v1.1.0 // indirect
139139
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
@@ -148,34 +148,33 @@ require (
148148
github.com/opencontainers/image-spec v1.1.1 // indirect
149149
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
150150
github.com/philhofer/fwd v1.2.0 // indirect
151-
github.com/pierrec/lz4/v4 v4.1.22 // indirect
151+
github.com/pierrec/lz4/v4 v4.1.23 // indirect
152152
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
153153
github.com/prometheus/client_model v0.6.2 // indirect
154-
github.com/prometheus/common v0.66.1 // indirect
155-
github.com/prometheus/procfs v0.16.1 // indirect
154+
github.com/prometheus/common v0.67.5 // indirect
155+
github.com/prometheus/procfs v0.19.2 // indirect
156156
github.com/prometheus/statsd_exporter v0.28.0 // indirect
157157
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
158158
github.com/rs/xid v1.6.0 // indirect
159159
github.com/ryanuber/go-glob v1.0.0 // indirect
160-
github.com/sagikazarmark/locafero v0.11.0 // indirect
161-
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
160+
github.com/sagikazarmark/locafero v0.12.0 // indirect
162161
github.com/spf13/afero v1.15.0 // indirect
163162
github.com/subosito/gotenv v1.6.0 // indirect
164-
github.com/tinylib/msgp v1.3.0 // indirect
163+
github.com/tinylib/msgp v1.6.3 // indirect
165164
github.com/viterin/partial v1.1.0 // indirect
166165
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
167166
github.com/xdg/stringprep v1.0.3 // indirect
168167
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
169-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
170-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
171-
go.opentelemetry.io/otel/metric v1.38.0 // indirect
172-
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
168+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
169+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
170+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
171+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
173172
go.uber.org/multierr v1.11.0 // indirect
174-
go.yaml.in/yaml/v2 v2.4.2 // indirect
173+
go.yaml.in/yaml/v2 v2.4.3 // indirect
175174
go.yaml.in/yaml/v3 v3.0.4 // indirect
176-
golang.org/x/time v0.12.0 // indirect
177-
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
178-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
175+
golang.org/x/time v0.14.0 // indirect
176+
google.golang.org/genproto/googleapis/api v0.0.0-20260114163908-3f89685c29c3 // indirect
177+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260114163908-3f89685c29c3 // indirect
179178
gopkg.in/yaml.v2 v2.4.0 // indirect
180179
gotest.tools/v3 v3.5.2 // indirect
181180
)

0 commit comments

Comments
 (0)