Skip to content

Commit d2791e1

Browse files
authored
Merge branch 'master' into master
2 parents d80f21d + 7108d80 commit d2791e1

5 files changed

Lines changed: 78 additions & 76 deletions

File tree

cmd/migrate/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ $ scoop install migrate
2727
### Linux (*.deb package)
2828

2929
```bash
30-
$ curl -L https://packagecloud.io/golang-migrate/migrate/gpgkey | apt-key add -
31-
$ echo "deb https://packagecloud.io/golang-migrate/migrate/ubuntu/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/migrate.list
30+
$ curl -fsSL https://packagecloud.io/golang-migrate/migrate/gpgkey | sudo gpg --dearmor -o /etc/apt/keyrings/migrate.gpg
31+
$ echo "deb [signed-by=/etc/apt/keyrings/migrate.gpg] https://packagecloud.io/golang-migrate/migrate/ubuntu/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/migrate.list
3232
$ apt-get update
3333
$ apt-get install -y migrate
3434
```

go.mod

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
github.com/aws/aws-sdk-go v1.49.6
1111
github.com/cenkalti/backoff/v4 v4.1.2
1212
github.com/cockroachdb/cockroach-go/v2 v2.1.1
13-
github.com/dhui/dktest v0.4.5
14-
github.com/docker/docker v27.2.0+incompatible
13+
github.com/dhui/dktest v0.4.6
14+
github.com/docker/docker v28.3.3+incompatible
1515
github.com/fsouza/fake-gcs-server v1.17.0
1616
github.com/go-sql-driver/mysql v1.5.0
1717
github.com/gobuffalo/here v0.6.0
@@ -31,44 +31,47 @@ require (
3131
github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8
3232
github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba
3333
github.com/snowflakedb/gosnowflake v1.6.19
34-
github.com/stretchr/testify v1.9.0
34+
github.com/stretchr/testify v1.10.0
3535
github.com/xanzy/go-gitlab v0.15.0
3636
go.mongodb.org/mongo-driver v1.7.5
37-
golang.org/x/oauth2 v0.18.0
37+
golang.org/x/oauth2 v0.27.0
3838
golang.org/x/tools v0.24.0
3939
google.golang.org/api v0.169.0
4040
modernc.org/ql v1.0.0
4141
modernc.org/sqlite v1.18.1
4242
)
4343

4444
require (
45+
cel.dev/expr v0.16.0 // indirect
46+
github.com/containerd/errdefs v1.0.0 // indirect
47+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
4548
github.com/distribution/reference v0.6.0 // indirect
4649
github.com/docker/go-connections v0.5.0 // indirect
4750
github.com/felixge/httpsnoop v1.0.4 // indirect
48-
github.com/go-logr/logr v1.4.2 // indirect
51+
github.com/go-logr/logr v1.4.3 // indirect
4952
github.com/go-logr/stdr v1.2.2 // indirect
5053
github.com/jackc/puddle/v2 v2.2.1 // indirect
5154
github.com/json-iterator/go v1.1.12 // indirect
52-
github.com/kr/text v0.2.0 // indirect
5355
github.com/moby/docker-image-spec v1.3.1 // indirect
56+
github.com/moby/sys/sequential v0.6.0 // indirect
5457
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
5558
github.com/modern-go/reflect2 v1.0.2 // indirect
56-
github.com/rogpeppe/go-internal v1.12.0 // indirect
59+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
5760
github.com/stretchr/objx v0.5.2 // indirect
61+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
5862
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
5963
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
60-
go.opentelemetry.io/otel v1.29.0 // indirect
64+
go.opentelemetry.io/otel v1.37.0 // indirect
6165
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
62-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
66+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
6367
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
64-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
68+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
6569
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
6670
)
6771

6872
require (
6973
cloud.google.com/go v0.112.1 // indirect
70-
cloud.google.com/go/compute v1.25.1 // indirect
71-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
74+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
7275
cloud.google.com/go/iam v1.1.6 // indirect
7376
cloud.google.com/go/longrunning v0.5.5 // indirect
7477
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -99,17 +102,17 @@ require (
99102
github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11 // indirect
100103
github.com/aws/smithy-go v1.13.3 // indirect
101104
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
102-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
105+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
103106
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
104-
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 // indirect
107+
github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 // indirect
105108
github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369 // indirect
106109
github.com/danieljoos/wincred v1.1.2 // indirect
107110
github.com/davecgh/go-spew v1.1.1 // indirect
108111
github.com/docker/go-units v0.5.0 // indirect
109112
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
110113
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 // indirect
111-
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
112-
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
114+
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
115+
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
113116
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
114117
github.com/gabriel-vasile/mimetype v1.4.1 // indirect
115118
github.com/go-stack/stack v1.8.0 // indirect
@@ -183,11 +186,10 @@ require (
183186
golang.org/x/text v0.23.0 // indirect
184187
golang.org/x/time v0.5.0 // indirect
185188
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
186-
google.golang.org/appengine v1.6.8 // indirect
187189
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
188-
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
189-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
190-
google.golang.org/grpc v1.64.1 // indirect
190+
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
191+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
192+
google.golang.org/grpc v1.67.0 // indirect
191193
google.golang.org/protobuf v1.34.2 // indirect
192194
gopkg.in/inf.v0 v0.9.1 // indirect
193195
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)