Merge branch 'golang-migrate:master' into master

Author: asmyasnikov

.github/workflows/ci.yaml

@@ -12,17 +12,17 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.23.x"
+          go-version: "1.24.x"
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.63.4
+          version: v1.64.8
 
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ["1.22.x", "1.23.x"]
+        go: ["1.23.x", "1.24.x"]
     steps:
       - uses: actions/checkout@v4
 
@@ -68,7 +68,7 @@ jobs:
           ruby-version: 2.7
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.23.x"
+          go-version: "1.24.x"
 
       - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3

.golangci.yml

@@ -13,10 +13,14 @@ linters:
     - unparam
     - nakedret
     - prealloc
+    - revive
     #- gosec
 linters-settings:
   misspell:
     locale: US
+  revive:
+    rules:
+      - name: redundant-build-tag
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine3.20 AS builder
+FROM golang:1.24-alpine3.21 AS builder
 ARG VERSION
 
 RUN apk add --no-cache git gcc musl-dev make
@@ -15,7 +15,7 @@ COPY . ./
 
 RUN make build-docker
 
-FROM alpine:3.20
+FROM alpine:3.21
 
 RUN apk add --no-cache ca-certificates
 

README.md

@@ -3,7 +3,7 @@
 [![Coverage Status](https://img.shields.io/coveralls/github/golang-migrate/migrate/master.svg)](https://coveralls.io/github/golang-migrate/migrate?branch=master)
 [![packagecloud.io](https://img.shields.io/badge/deb-packagecloud.io-844fec.svg)](https://packagecloud.io/golang-migrate/migrate?filter=debs)
 [![Docker Pulls](https://img.shields.io/docker/pulls/migrate/migrate.svg)](https://hub.docker.com/r/migrate/migrate/)
-![Supported Go Versions](https://img.shields.io/badge/Go-1.22%2C%201.23-lightgrey.svg)
+![Supported Go Versions](https://img.shields.io/badge/Go-1.23%2C%201.24-lightgrey.svg)
 [![GitHub Release](https://img.shields.io/github/release/golang-migrate/migrate.svg)](https://github.com/golang-migrate/migrate/releases)
 [![Go Report Card](https://goreportcard.com/badge/github.com/golang-migrate/migrate/v4)](https://goreportcard.com/report/github.com/golang-migrate/migrate/v4)
 
@@ -88,7 +88,7 @@ Source drivers read migrations from local or remote sources. [Add a new source?]
 * Handles ctrl+c (SIGINT) gracefully.
 * No config search paths, no config files, no magic ENV var injections.
 
-__[CLI Documentation](cmd/migrate)__
+[CLI Documentation](cmd/migrate) (includes CLI install instructions)
 
 ### Basic usage
 

cmd/migrate/README.md

@@ -86,14 +86,18 @@ Options:
   -help            Print usage
 
 Commands:
-  create [-ext E] [-dir D] [-seq] [-digits N] [-format] NAME
-               Create a set of timestamped up/down migrations titled NAME, in directory D with extension E.
-               Use -seq option to generate sequential up/down migrations with N digits.
-               Use -format option to specify a Go time format string.
+  create [-ext E] [-dir D] [-seq] [-digits N] [-format] [-tz] NAME
+           Create a set of timestamped up/down migrations titled NAME, in directory D with extension E.
+           Use -seq option to generate sequential up/down migrations with N digits.
+           Use -format option to specify a Go time format string. Note: migrations with the same time cause "duplicate migration version" error.
+           Use -tz option to specify the timezone that will be used when generating non-sequential migrations (defaults: UTC).
+
   goto V       Migrate to version V
   up [N]       Apply all or N up migrations
-  down [N]     Apply all or N down migrations
-  drop         Drop everything inside database
+  down [N] [-all]    Apply all or N down migrations
+        Use -all to apply all down migrations
+  drop [-f]    Drop everything inside database
+        Use -f to bypass confirmation
   force V      Set version V but don't run migration (ignores dirty state)
   version      Print current migration version
 ```

database/firebird/firebird.go

@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package firebird
 

database/mysql/mysql.go

@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package mysql
 

database/pgx/pgx.go

@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package pgx
 

database/pgx/v5/pgx.go

@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package pgx
 

database/postgres/postgres.go

@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package postgres