Skip to content

Commit 71cdaaa

Browse files
erkaerka
committed
Merge branch 'master' into aws-sdk-go-v2
2 parents dfc4440 + 36d17ba commit 71cdaaa

File tree

13 files changed

+48
-64
lines changed

13 files changed

+48
-64
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
name: lint
1010
runs-on: ubuntu-latest
1111
steps:
12+
- uses: actions/checkout@v4
1213
- uses: actions/setup-go@v5
1314
with:
1415
go-version: "1.23.x"
15-
- uses: actions/checkout@v4
1616
- name: golangci-lint
1717
uses: golangci/golangci-lint-action@v6
1818
with:
19-
version: latest
19+
version: v1.63.4
2020

2121
test:
2222
runs-on: ubuntu-latest

‎FAQ.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
and then "force" the expected version.
6666

6767
#### What happens if two programs try and update the database at the same time?
68-
Database-specific locking features are used by *some* database drivers to prevent multiple instances of migrate from running migrations at the same time
68+
Database-specific locking features are used by *some* database drivers to prevent multiple instances of migrate from running migrations on
6969
the same database at the same time. For example, the MySQL driver uses the `GET_LOCK` function, while the Postgres driver uses
7070
the `pg_advisory_lock` function.
7171

‎database/clickhouse/clickhouse_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var (
2626
PortRequired: true, ReadyFunc: isReady,
2727
}
2828
specs = []dktesting.ContainerSpec{
29-
{ImageName: "yandex/clickhouse-server:21.3", Options: opts},
29+
{ImageName: "clickhouse:24.8", Options: opts},
3030
}
3131
)
3232

‎database/cockroachdb/cockroachdb_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
const defaultPort = 26257
2727

2828
var (
29-
opts = dktest.Options{Cmd: []string{"start", "--insecure"}, PortRequired: true, ReadyFunc: isReady}
30-
// Released versions: https://www.cockroachlabs.com/docs/releases/
29+
opts = dktest.Options{Cmd: []string{"start-single-node", "--insecure"}, PortRequired: true, ReadyFunc: isReady}
30+
// Supported versions: https://www.cockroachlabs.com/docs/releases/release-support-policy#supported-versions
3131
specs = []dktesting.ContainerSpec{
32-
{ImageName: "cockroachdb/cockroach:v1.0.7", Options: opts},
33-
{ImageName: "cockroachdb/cockroach:v1.1.9", Options: opts},
34-
{ImageName: "cockroachdb/cockroach:v2.0.7", Options: opts},
35-
{ImageName: "cockroachdb/cockroach:v2.1.3", Options: opts},
32+
{ImageName: "cockroachdb/cockroach:latest-v24.3", Options: opts},
33+
{ImageName: "cockroachdb/cockroach:latest-v24.1", Options: opts},
34+
{ImageName: "cockroachdb/cockroach:latest-v23.2", Options: opts},
35+
{ImageName: "cockroachdb/cockroach:latest-v23.1", Options: opts},
3636
}
3737
)
3838

‎database/firebird/firebird_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ var (
3838
},
3939
}
4040
specs = []dktesting.ContainerSpec{
41-
{ImageName: "jacobalberty/firebird:2.5-ss", Options: opts},
42-
{ImageName: "jacobalberty/firebird:3.0", Options: opts},
41+
{ImageName: "jacobalberty/firebird:v3.0", Options: opts},
42+
{ImageName: "jacobalberty/firebird:v4.0", Options: opts},
43+
{ImageName: "jacobalberty/firebird:v5.0", Options: opts},
4344
}
4445
)
4546

‎database/mongodb/mongodb_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ var (
3232
opts = dktest.Options{PortRequired: true, ReadyFunc: isReady}
3333
// Supported versions: https://www.mongodb.com/support-policy
3434
specs = []dktesting.ContainerSpec{
35-
{ImageName: "mongo:3.4", Options: opts},
36-
{ImageName: "mongo:3.6", Options: opts},
37-
{ImageName: "mongo:4.0", Options: opts},
38-
{ImageName: "mongo:4.2", Options: opts},
35+
{ImageName: "mongo:5.0", Options: opts},
36+
{ImageName: "mongo:6.0", Options: opts},
37+
{ImageName: "mongo:7.0", Options: opts},
38+
{ImageName: "mongo:8.0", Options: opts},
3939
}
4040
)
4141

‎database/mysql/mysql_test.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,11 @@ var (
4040
}
4141
// Supported versions: https://www.mysql.com/support/supportedplatforms/database.html
4242
specs = []dktesting.ContainerSpec{
43-
{ImageName: "mysql:5.5", Options: opts},
44-
{ImageName: "mysql:5.6", Options: opts},
45-
{ImageName: "mysql:5.7", Options: opts},
4643
{ImageName: "mysql:8.0", Options: opts},
4744
{ImageName: "mysql:8.4", Options: opts},
4845
{ImageName: "mysql:9.0", Options: opts},
4946
}
5047
specsAnsiQuotes = []dktesting.ContainerSpec{
51-
{ImageName: "mysql:5.5", Options: optsAnsiQuotes},
52-
{ImageName: "mysql:5.6", Options: optsAnsiQuotes},
53-
{ImageName: "mysql:5.7", Options: optsAnsiQuotes},
5448
{ImageName: "mysql:8.0", Options: optsAnsiQuotes},
5549
{ImageName: "mysql:8.4", Options: optsAnsiQuotes},
5650
{ImageName: "mysql:9.0", Options: optsAnsiQuotes},

‎database/pgx/pgx_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ var (
3434
PortRequired: true, ReadyFunc: isReady}
3535
// Supported versions: https://www.postgresql.org/support/versioning/
3636
specs = []dktesting.ContainerSpec{
37-
{ImageName: "postgres:12", Options: opts},
3837
{ImageName: "postgres:13", Options: opts},
3938
{ImageName: "postgres:14", Options: opts},
4039
{ImageName: "postgres:15", Options: opts},
4140
{ImageName: "postgres:16", Options: opts},
41+
{ImageName: "postgres:17", Options: opts},
4242
}
4343
)
4444

‎database/pgx/v5/pgx_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ var (
3535
PortRequired: true, ReadyFunc: isReady}
3636
// Supported versions: https://www.postgresql.org/support/versioning/
3737
specs = []dktesting.ContainerSpec{
38-
{ImageName: "postgres:12", Options: opts},
3938
{ImageName: "postgres:13", Options: opts},
4039
{ImageName: "postgres:14", Options: opts},
4140
{ImageName: "postgres:15", Options: opts},
4241
{ImageName: "postgres:16", Options: opts},
42+
{ImageName: "postgres:17", Options: opts},
4343
}
4444
)
4545

‎database/postgres/postgres_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ var (
3535
PortRequired: true, ReadyFunc: isReady}
3636
// Supported versions: https://www.postgresql.org/support/versioning/
3737
specs = []dktesting.ContainerSpec{
38-
{ImageName: "postgres:12", Options: opts},
3938
{ImageName: "postgres:13", Options: opts},
4039
{ImageName: "postgres:14", Options: opts},
4140
{ImageName: "postgres:15", Options: opts},
4241
{ImageName: "postgres:16", Options: opts},
42+
{ImageName: "postgres:17", Options: opts},
4343
}
4444
)
4545

0 commit comments

Comments
 (0)