From 51359a47493746b3812d16569615b567f8f67c28 Mon Sep 17 00:00:00 2001 From: Lucas Bremgartner Date: Thu, 12 Sep 2024 21:33:53 +0200 Subject: [PATCH] Update golang.org/x/tools (#157) * Update golang.org/x/tools * Update go versions for CI * Update golangci-lint * Go mod tidy * Fix linting issues * Update goreleaser --- .github/workflows/ci.yml | 4 ++-- .github/workflows/deps.yml | 2 +- .github/workflows/go-cross.yml | 2 +- .github/workflows/release.yml | 6 +++--- .goreleaser.yml | 7 +++++-- bootstrap/scan.go | 8 ++++---- go.mod | 8 +++++--- go.sum | 8 ++++---- test/state/state_test.go | 3 +-- test/stateclone/stateclone_test.go | 3 +-- test/statereadonly/statereadonly_test.go | 3 +-- 11 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5d85159..3ed67cfa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,8 @@ jobs: name: ci runs-on: ubuntu-latest env: - GO_VERSION: "1.20" - GOLANGCI_LINT_VERSION: v1.52.2 + GO_VERSION: "stable" + GOLANGCI_LINT_VERSION: v1.61.0 CGO_ENABLED: 0 steps: diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index 91440a2b..699ae994 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: "1.20" + go-version: "stable" - uses: actions/go-dependency-submission@v1 with: go-mod-path: go.mod diff --git a/.github/workflows/go-cross.yml b/.github/workflows/go-cross.yml index 1bd861f0..3c9cda93 100644 --- a/.github/workflows/go-cross.yml +++ b/.github/workflows/go-cross.yml @@ -17,7 +17,7 @@ jobs: strategy: matrix: - go-version: [ "1.20", "1.21", "1.x" ] + go-version: [ "stable", "oldstable", "1.x" ] os: [ubuntu-latest, macos-latest, windows-latest] steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8a40e3eb..815f433b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,14 +20,14 @@ jobs: name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.20" + go-version: "stable" - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v4 + uses: goreleaser/goreleaser-action@v6 with: distribution: goreleaser - version: latest + version: "~> v2" args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yml b/.goreleaser.yml index 1d84b10f..2cac69f5 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,6 @@ +--- +version: 2 + # This is an example .goreleaser.yml file with some sane defaults. # Make sure to check the documentation at http://goreleaser.com before: @@ -23,9 +26,9 @@ archives: {{- else }}{{ .Arch }}{{ end }} {{- if .Arm }}v{{ .Arm }}{{ end -}} snapshot: - name_template: "{{ .Tag }}-next" + version_template: "{{ .Tag }}-next" changelog: - skip: true + disable: true release: github: owner: mna diff --git a/bootstrap/scan.go b/bootstrap/scan.go index 41923f51..f03abb33 100644 --- a/bootstrap/scan.go +++ b/bootstrap/scan.go @@ -221,9 +221,9 @@ func (s *Scanner) scanEscape(quote rune) bool { msg := "unknown escape sequence" if s.cur == -1 || s.cur == '\n' { msg = "escape sequence not terminated" - s.errorf(msg) + s.errorf("%s", msg) } else { - s.errorf(msg) + s.errorf("%s", msg) s.read() } return false @@ -268,10 +268,10 @@ func (s *Scanner) scanEscape(quote rune) bool { msg := fmt.Sprintf("illegal character %#U in escape sequence", s.cur) if s.cur == -1 || s.cur == '\n' { msg = "escape sequence not terminated" - s.errorf(msg) + s.errorf("%s", msg) return false } - s.errorf(msg) + s.errorf("%s", msg) s.read() return false } diff --git a/go.mod b/go.mod index fe886686..045e12e3 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,12 @@ module github.com/mna/pigeon -go 1.20 +go 1.22.0 -require golang.org/x/tools v0.24.0 +toolchain go1.22.6 + +require golang.org/x/tools v0.25.0 require ( - golang.org/x/mod v0.20.0 // indirect + golang.org/x/mod v0.21.0 // indirect golang.org/x/sync v0.8.0 // indirect ) diff --git a/go.sum b/go.sum index c4895982..ed883921 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= diff --git a/test/state/state_test.go b/test/state/state_test.go index 2bf767c1..44b6913d 100644 --- a/test/state/state_test.go +++ b/test/state/state_test.go @@ -13,9 +13,8 @@ var cases = map[string]int{ func TestState(t *testing.T) { for tc, exp := range cases { got, err := Parse("", []byte(tc), Memoize(false), InitState("countCs", 10)) - if err != nil { - t.Errorf(err.Error()) + t.Errorf("%s", err.Error()) } if got != exp { t.Errorf("%q: want %v, got %v", tc, exp, got) diff --git a/test/stateclone/stateclone_test.go b/test/stateclone/stateclone_test.go index 7e188cfd..ec464a07 100644 --- a/test/stateclone/stateclone_test.go +++ b/test/stateclone/stateclone_test.go @@ -15,9 +15,8 @@ func TestState(t *testing.T) { vals := make(values, 1) vals[0] = 10 got, err := Parse("", []byte(tc), Memoize(false), InitState("vals", vals)) - if err != nil { - t.Errorf(err.Error()) + t.Errorf("%s", err.Error()) } vals = got.(values) res := 0 diff --git a/test/statereadonly/statereadonly_test.go b/test/statereadonly/statereadonly_test.go index 860d45bd..c8eaa676 100644 --- a/test/statereadonly/statereadonly_test.go +++ b/test/statereadonly/statereadonly_test.go @@ -13,9 +13,8 @@ var cases = map[string]int{ func TestStateReadonly(t *testing.T) { for tc, exp := range cases { got, err := Parse("", []byte(tc), Memoize(false)) - if err != nil { - t.Errorf(err.Error()) + t.Errorf("%s", err.Error()) } if got != exp { t.Errorf("%q: want %v, got %v", tc, exp, got)