From 33dfa4f6461156dbc7f347ed27f8ecaa2d64c477 Mon Sep 17 00:00:00 2001 From: Fabio Ribeiro Date: Tue, 1 Apr 2025 20:43:14 +0200 Subject: [PATCH] remove: support for go v1.20 --- .github/workflows/test.yml | 4 ++-- .golangci.toml | 14 -------------- .golangci.yaml | 36 ++++++++++++++++++++++++++++++++++++ CONTRIBUTING.md | 2 +- README.md | 2 +- go.mod | 2 +- go.sum | 7 +++++++ 7 files changed, 48 insertions(+), 19 deletions(-) delete mode 100644 .golangci.toml create mode 100644 .golangci.yaml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da070fa..40ca7ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,9 +14,9 @@ jobs: strategy: matrix: go-version: - - '1.20.x' - '1.21.x' - '1.22.x' + - '1.23.x' platform: [ubuntu-latest] name: test @@ -51,7 +51,7 @@ jobs: - name: golanci-linter uses: golangci/golangci-lint-action@v6 with: - version: v1.55.2 + version: v1.64.7 - name: run unit tests run: make test diff --git a/.golangci.toml b/.golangci.toml deleted file mode 100644 index 5495a3c..0000000 --- a/.golangci.toml +++ /dev/null @@ -1,14 +0,0 @@ -[run] -timeout = "120s" - -[output] -format = "colored-line-number" - -[linters] -enable = [ - "gocyclo", "unconvert", "goimports", "unused", "vetshadow","misspell", - "nakedret", "errcheck", "revive", "ineffassign", "goconst", "vet", - "unparam", "gofumpt", "prealloc", "gomnd", "gocritic"] - -[issues] -exclude-use-default = false diff --git a/.golangci.yaml b/.golangci.yaml new file mode 100644 index 0000000..3ada157 --- /dev/null +++ b/.golangci.yaml @@ -0,0 +1,36 @@ +--- +run: + timeout: "240s" + +output: + formats: + - format: "colored-line-number" + +linters: + enable: + - gocyclo + - unconvert + - goimports + - unused + - misspell + - nakedret + - errcheck + - revive + - ineffassign + - goconst + - govet + - unparam + - gofumpt + - prealloc + - mnd + - gocritic + + +linters-settings: + revive: + rules: + - name: package-comments + disabled: true + +issues: + exclude-use-default: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0bb6aed..b45f808 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ By participating to this project, you agree to abide our [code of conduct](/CODE Prerequisites: * `make` -* [Go 1.9+](https://golang.org/doc/install) +* [Go 1.21+](https://golang.org/doc/install) Clone `cachego` from source into `$GOPATH`: diff --git a/README.md b/README.md index 293e34a..5e993ce 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Simple interface for caching ## Installation -Cachego requires Go 1.20 or later. +Cachego requires Go 1.21 or later. ``` go get github.com/faabiosr/cachego diff --git a/go.mod b/go.mod index e8dd8c8..6e1fb45 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/faabiosr/cachego -go 1.20 +go 1.21 require ( github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 diff --git a/go.sum b/go.sum index d4ac395..f237214 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,19 @@ github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous= github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= +github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= @@ -17,9 +21,11 @@ github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxU github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM= github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= @@ -65,3 +71,4 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=