Skip to content

Commit 05b7e49

Browse files
barnesewbarnesew
committed
Merge branch 'migrate/master'
2 parents 2fa9bec + 604248c commit 05b7e49

File tree

19 files changed

+270
-243
lines changed

19 files changed

+270
-243
lines changed

‎.github/workflows/ci.yaml‎

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

2121
test:
2222
runs-on: ubuntu-latest
2323
strategy:
2424
matrix:
25-
go: ["1.21.x", "1.22.x"]
25+
go: ["1.22.x", "1.23.x"]
2626
steps:
2727
- uses: actions/checkout@v4
2828

@@ -68,7 +68,7 @@ jobs:
6868
ruby-version: 2.7
6969
- uses: actions/setup-go@v5
7070
with:
71-
go-version: "1.22.x"
71+
go-version: "1.23.x"
7272

7373
- uses: docker/setup-qemu-action@v3
7474
- uses: docker/setup-buildx-action@v3
@@ -97,6 +97,9 @@ jobs:
9797
- run: package_cloud push golang-migrate/migrate/ubuntu/jammy dist/migrate.linux-amd64.deb
9898
env:
9999
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
100+
- run: package_cloud push golang-migrate/migrate/ubuntu/noble dist/migrate.linux-amd64.deb
101+
env:
102+
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
100103
- run: package_cloud push golang-migrate/migrate/debian/buster dist/migrate.linux-amd64.deb
101104
env:
102105
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine3.19 AS builder
1+
FROM golang:1.23-alpine3.20 AS builder
22
ARG VERSION
33

44
RUN apk add --no-cache git gcc musl-dev make
@@ -15,7 +15,7 @@ COPY . ./
1515

1616
RUN make build-docker
1717

18-
FROM alpine:3.19
18+
FROM alpine:3.20
1919

2020
RUN apk add --no-cache ca-certificates
2121

‎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

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Coverage Status](https://img.shields.io/coveralls/github/golang-migrate/migrate/master.svg)](https://coveralls.io/github/golang-migrate/migrate?branch=master)
44
[![packagecloud.io](https://img.shields.io/badge/deb-packagecloud.io-844fec.svg)](https://packagecloud.io/golang-migrate/migrate?filter=debs)
55
[![Docker Pulls](https://img.shields.io/docker/pulls/migrate/migrate.svg)](https://hub.docker.com/r/migrate/migrate/)
6-
![Supported Go Versions](https://img.shields.io/badge/Go-1.21%2C%201.22-lightgrey.svg)
6+
![Supported Go Versions](https://img.shields.io/badge/Go-1.22%2C%201.23-lightgrey.svg)
77
[![GitHub Release](https://img.shields.io/github/release/golang-migrate/migrate.svg)](https://github.com/golang-migrate/migrate/releases)
88
[![Go Report Card](https://goreportcard.com/badge/github.com/golang-migrate/migrate/v4)](https://goreportcard.com/report/github.com/golang-migrate/migrate/v4)
99

@@ -145,7 +145,7 @@ func main() {
145145
m, err := migrate.NewWithDatabaseInstance(
146146
"file:///migrations",
147147
"postgres", driver)
148-
m.Up() // or m.Step(2) if you want to explicitly set the number of migrations to run
148+
m.Up() // or m.Steps(2) if you want to explicitly set the number of migrations to run
149149
}
150150
```
151151

‎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: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,14 @@ 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},
46-
{ImageName: "mysql:8", Options: opts},
43+
{ImageName: "mysql:8.0", Options: opts},
44+
{ImageName: "mysql:8.4", Options: opts},
45+
{ImageName: "mysql:9.0", Options: opts},
4746
}
4847
specsAnsiQuotes = []dktesting.ContainerSpec{
49-
{ImageName: "mysql:5.5", Options: optsAnsiQuotes},
50-
{ImageName: "mysql:5.6", Options: optsAnsiQuotes},
51-
{ImageName: "mysql:5.7", Options: optsAnsiQuotes},
52-
{ImageName: "mysql:8", Options: optsAnsiQuotes},
48+
{ImageName: "mysql:8.0", Options: optsAnsiQuotes},
49+
{ImageName: "mysql:8.4", Options: optsAnsiQuotes},
50+
{ImageName: "mysql:9.0", Options: optsAnsiQuotes},
5351
}
5452
)
5553

‎database/pgx/pgx_test.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,11 @@ var (
3434
PortRequired: true, ReadyFunc: isReady}
3535
// Supported versions: https://www.postgresql.org/support/versioning/
3636
specs = []dktesting.ContainerSpec{
37-
{ImageName: "postgres:9.5", Options: opts},
38-
{ImageName: "postgres:9.6", Options: opts},
39-
{ImageName: "postgres:10", Options: opts},
40-
{ImageName: "postgres:11", Options: opts},
41-
{ImageName: "postgres:12", Options: opts},
4237
{ImageName: "postgres:13", Options: opts},
4338
{ImageName: "postgres:14", Options: opts},
4439
{ImageName: "postgres:15", Options: opts},
40+
{ImageName: "postgres:16", Options: opts},
41+
{ImageName: "postgres:17", Options: opts},
4542
}
4643
)
4744

0 commit comments

Comments
 (0)