Merge pull request #231 from go-gormigrate/update-deps

Update deps

Author: avakarev

.github/workflows/integration-test.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
           version: latest
           working-directory: integration-test

.github/workflows/lint.yml

@@ -12,19 +12,19 @@ jobs:
   lint:
     strategy:
       matrix:
-        go: ['1.24', '1.23', '1.22', '1.21', '1.20', '1.19', '1.18']
+        go: ['1.25', '1.24', '1.23', '1.22', '1.21', '1.20', '1.19', '1.18']
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v8
         with:
           version: latest
           args: --skip-dirs=integration-test

gormigrate.go

@@ -2,6 +2,7 @@
 package gormigrate
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"reflect"
@@ -382,7 +383,7 @@ func (g *Gormigrate) runMigration(migration *Migration) error {
 //	struct defined as {
 //	  ID string `gorm:"primaryKey;column:<Options.IDColumnName>;size:<Options.IDColumnSize>"`
 //	}
-func (g *Gormigrate) model() interface{} {
+func (g *Gormigrate) model() any {
 	f := reflect.StructField{
 		Name: reflect.ValueOf("ID").Interface().(string),
 		Type: reflect.TypeOf(""),
@@ -439,7 +440,11 @@ func (g *Gormigrate) unknownMigrationsHaveHappened() (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	defer rows.Close()
+	defer func() {
+		if err := rows.Close(); err != nil {
+			g.tx.Logger.Error(context.TODO(), err.Error())
+		}
+	}()
 
 	validIDSet := make(map[string]struct{}, len(g.migrations)+1)
 	validIDSet[initSchemaMigrationID] = struct{}{}