From 91c12f2e9b0a6a03bde565aa6ac9123f615d0a15 Mon Sep 17 00:00:00 2001 From: Jeff Principe Date: Mon, 2 May 2022 13:03:12 -0700 Subject: [PATCH] ci: switch to go 1.18 for test and release (#65) --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- .golangci.yml | 7 +++++++ go.mod | 2 +- go.sum | 2 ++ magefile.go | 2 +- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab88b43..e1913f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: 1.17.x + go-version: 1.18.x - name: Run GoReleaser uses: goreleaser/goreleaser-action@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff72de5..7f39e84 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: 1.17.x + go-version: 1.18.x - name: Checkout code uses: actions/checkout@v2 - name: Lint diff --git a/.golangci.yml b/.golangci.yml index bcfec72..55c8959 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -11,6 +11,13 @@ linters: - revive - unconvert + # Not currently compatible with go 1.18 + disable: + - gosimple + - staticcheck + - structcheck + - unused + linters-settings: gocyclo: min-complexity: 15 diff --git a/go.mod b/go.mod index d736bf5..1bd845a 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/onsi/ginkgo v1.14.2 // indirect github.com/onsi/gomega v1.10.3 // indirect github.com/pelletier/go-toml v1.9.1 // indirect - github.com/princjef/mageutil v0.1.0 + github.com/princjef/mageutil v1.0.0 github.com/russross/blackfriday/v2 v2.1.0 github.com/sergi/go-diff v1.2.0 // indirect github.com/sirupsen/logrus v1.8.1 diff --git a/go.sum b/go.sum index e743dcf..163b197 100644 --- a/go.sum +++ b/go.sum @@ -235,6 +235,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/princjef/mageutil v0.1.0 h1:WXB92nDhPh8oKR7woRWCriDFeF75mYZ6JwDUxo8DJ34= github.com/princjef/mageutil v0.1.0/go.mod h1:mkShhaUomCYfAoVvTKRcbAs8YSVPdtezI5j6K+VXhrs= +github.com/princjef/mageutil v1.0.0 h1:1OfZcJUMsooPqieOz2ooLjI+uHUo618pdaJsbCXcFjQ= +github.com/princjef/mageutil v1.0.0/go.mod h1:mkShhaUomCYfAoVvTKRcbAs8YSVPdtezI5j6K+VXhrs= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= diff --git a/magefile.go b/magefile.go index 0f58960..de98caa 100644 --- a/magefile.go +++ b/magefile.go @@ -13,7 +13,7 @@ import ( var linter = bintool.Must(bintool.New( "golangci-lint{{.BinExt}}", - "1.43.0", + "1.45.2", "https://github.com/golangci/golangci-lint/releases/download/v{{.Version}}/golangci-lint-{{.Version}}-{{.GOOS}}-{{.GOARCH}}{{.ArchiveExt}}", ))