Skip to content

Commit 8c9b349

Browse files
authored
Merge pull request #822 from henrybear327/1.3_go/1.22.0
[release-1.3] Bump go toolchain to 1.22.6
2 parents 01f29e9 + 6a0b720 commit 8c9b349

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.github/workflows/tests.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ jobs:
4747
;;
4848
esac
4949
- name: golangci-lint
50-
uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # v3.4.0
50+
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
51+
with:
52+
version: v1.60.1
5153

5254
test-windows:
5355
strategy:
@@ -86,7 +88,9 @@ jobs:
8688
esac
8789
shell: bash
8890
- name: golangci-lint
89-
uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # v3.4.0
91+
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
92+
with:
93+
version: v1.60.1
9094

9195
coverage:
9296
needs: ["test-linux", "test-windows"]

.go-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21.13
1+
1.22.6

db.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ func (db *DB) munmap() error {
524524
// gofail: var unmapError string
525525
// return errors.New(unmapError)
526526
if err := munmap(db); err != nil {
527-
return fmt.Errorf("unmap error: " + err.Error())
527+
return fmt.Errorf("unmap error: %v", err.Error())
528528
}
529529

530530
return nil
@@ -571,7 +571,7 @@ func (db *DB) munlock(fileSize int) error {
571571
// gofail: var munlockError string
572572
// return errors.New(munlockError)
573573
if err := munlock(db, fileSize); err != nil {
574-
return fmt.Errorf("munlock error: " + err.Error())
574+
return fmt.Errorf("munlock error: %v", err.Error())
575575
}
576576
return nil
577577
}
@@ -580,7 +580,7 @@ func (db *DB) mlock(fileSize int) error {
580580
// gofail: var mlockError string
581581
// return errors.New(mlockError)
582582
if err := mlock(db, fileSize); err != nil {
583-
return fmt.Errorf("mlock error: " + err.Error())
583+
return fmt.Errorf("mlock error: %v", err.Error())
584584
}
585585
return nil
586586
}

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module go.etcd.io/bbolt
22

3-
go 1.21
3+
go 1.22
44

5-
toolchain go1.21.13
5+
toolchain go1.22.6
66

77
require (
88
github.com/stretchr/testify v1.8.1

0 commit comments

Comments
 (0)