Skip to content

Commit

Permalink
Bump to Go 1.23 and golangci-lint 1.63.4
Browse files Browse the repository at this point in the history
  • Loading branch information
fxamacker committed Feb 13, 2025
1 parent 02764b9 commit 9f9e302
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
go-version: ['1.22', '1.23']
go-version: ['1.23', '1.24']

steps:
- name: Install Go
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/safer-golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ on:
branches: [main, master]

env:
GO_VERSION: '1.22'
GOLINTERS_VERSION: 1.56.2
GO_VERSION: '1.23'
GOLINTERS_VERSION: 1.63.4
GOLINTERS_ARCH: linux-amd64
GOLINTERS_TGZ_DGST: e1c313fb5fc85a33890fdee5dbb1777d1f5829c84d655a47a55688f3aad5e501
GOLINTERS_TGZ_DGST: 01abb14a4df47b5ca585eff3c34b105023cba92ec34ff17212dbb83855581690
GOLINTERS_TIMEOUT: 15m
OPENSSL_DGST_CMD: openssl dgst -sha256 -r
CURL_CMD: curl --proto =https --tlsv1.2 --location --silent --show-error --fail
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ linters:
- unused

# enable extra linters
- exportloopref
- copyloopvar
- gocritic
- gofmt
- goimports
Expand Down
2 changes: 1 addition & 1 deletion array_bench_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ func benchmarkArrayPopIterate(b *testing.B, initialArrayCount int) {
storable = s
})
if err != nil {
b.Errorf(err.Error())
b.Error(err.Error())
}
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/smoke/map.go
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ func modifyMap(

// Compare old value from map with old value from elements
if (oldExpectedValue == nil) != (existingStorable == nil) {
return nil, 0, fmt.Errorf("Set returned storable %s != expected %s", existingStorable, oldExpectedValue)
return nil, 0, fmt.Errorf("set returned storable %s != expected %s", existingStorable, oldExpectedValue)
}

if existingStorable != nil {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/onflow/atree

go 1.17
go 1.23

require (
github.com/fxamacker/cbor/v2 v2.4.1-0.20220515183430-ad2eae63303f
Expand Down
2 changes: 1 addition & 1 deletion storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@ func (s *PersistentSlabStorage) GetAllChildReferences(id SlabID) (
return nil, nil, err
}
if !found {
return nil, nil, NewSlabNotFoundErrorf(id, fmt.Sprintf("failed to get root slab by id %s", id))
return nil, nil, NewSlabNotFoundErrorf(id, "failed to get root slab by id %s", id)
}
return s.getAllChildReferences(slab)
}
Expand Down

0 comments on commit 9f9e302

Please sign in to comment.