From 174cf20db5ef9df7663dca5349ca39000d03c30f Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Thu, 10 Aug 2023 13:48:38 -0400 Subject: [PATCH 1/2] chore: upgrade to Go 1.21 --- .github/workflows/ci.yml | 2 +- .github/workflows/lint.yml | 2 +- README.md | 2 +- go.mod | 2 +- go.sum | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bfd20f..b44be25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - release/** env: - GO_VERSION: '1.20' + GO_VERSION: '1.21' jobs: test: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 17c6f60..30f5553 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,7 +9,7 @@ on: - release/** env: - GO_VERSION: '1.20' + GO_VERSION: '1.21' jobs: golangci-lint: diff --git a/README.md b/README.md index adf95db..ae534ba 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ func main() { ## Contributing -1. [Install Go](https://go.dev/doc/install) 1.20+ +1. [Install Go](https://go.dev/doc/install) 1.21+ 1. [Install golangci-lint](https://golangci-lint.run/usage/install/) ### Helpful Commands diff --git a/go.mod b/go.mod index 7434644..4399bb2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/celestiaorg/rsmt2d -go 1.20 +go 1.21 require ( github.com/celestiaorg/merkletree v0.0.0-20210714075610-a84dc3ddbbe4 diff --git a/go.sum b/go.sum index 43c2305..35da479 100644 --- a/go.sum +++ b/go.sum @@ -8,6 +8,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= @@ -28,8 +29,11 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= +github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= +github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= +github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= gitlab.com/NebulousLabs/errors v0.0.0-20171229012116-7ead97ef90b8/go.mod h1:ZkMZ0dpQyWwlENaeZVBiQRjhMEZvk6VTXquzl3FOFP8= From 8ee97039161e3bfb74fed9b8cd91ac2dfd5516d8 Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Thu, 10 Aug 2023 14:07:04 -0400 Subject: [PATCH 2/2] deps: bump to golangci-lint 1.54.0 https://github.com/golangci/golangci-lint/releases/tag/v1.54.0 claims support for Go 1.21 --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 30f5553..d4731ac 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -23,6 +23,6 @@ jobs: go-version: ${{ env.GO_VERSION }} - uses: golangci/golangci-lint-action@v3.6.0 with: - version: v1.52.2 + version: v1.54.0 args: --timeout 10m github-token: ${{ secrets.github_token }}