diff --git a/README.md b/README.md index e4eb570..daa6a29 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ import _ "github.com/bool64/dev" // Include development helpers to project. Add `Makefile` to your module with includes standard targets. ```Makefile -#GOLANGCI_LINT_VERSION := "v1.59.1" # Optional configuration to pinpoint golangci-lint version. +#GOLANGCI_LINT_VERSION := "v1.61.0" # Optional configuration to pinpoint golangci-lint version. # The head of Makefile determines location of dev-go to include standard targets. GO ?= go diff --git a/makefiles/base.mk b/makefiles/base.mk index e30e6c8..d1ea9ce 100644 --- a/makefiles/base.mk +++ b/makefiles/base.mk @@ -1,4 +1,4 @@ -#GOLANGCI_LINT_VERSION := "v1.59.1" # Optional configuration to pinpoint golangci-lint version. +#GOLANGCI_LINT_VERSION := "v1.61.0" # Optional configuration to pinpoint golangci-lint version. # The head of Makefile determines location of dev-go to include standard targets. GO ?= go diff --git a/scripts/.golangci.yml b/scripts/.golangci.yml index 672106f..690c24c 100644 --- a/scripts/.golangci.yml +++ b/scripts/.golangci.yml @@ -33,7 +33,6 @@ linters: - ireturn - exhaustruct - nonamedreturns - - structcheck - testableexamples - dupword - depguard @@ -49,17 +48,18 @@ issues: - gomnd - mnd - goconst - - goerr113 - noctx - funlen - dupl - structcheck - unused - unparam - - nosnakecase path: "_test.go" - linters: - errcheck # Error checking omitted for brevity. - gosec path: "example_" + - linters: + - revive + text: "unused-parameter: parameter" diff --git a/scripts/lint.sh b/scripts/lint.sh index 65914d3..332ad41 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash [ -z "$GO" ] && GO=go -[ -z "$GOLANGCI_LINT_VERSION" ] && GOLANGCI_LINT_VERSION="v1.59.1" +[ -z "$GOLANGCI_LINT_VERSION" ] && GOLANGCI_LINT_VERSION="v1.61.0" # detecting GOPATH and removing trailing "/" if any GOPATH="$(go env GOPATH)" diff --git a/templates/github/workflows/bench.yml b/templates/github/workflows/bench.yml index f118ccd..a97f7e7 100644 --- a/templates/github/workflows/bench.yml +++ b/templates/github/workflows/bench.yml @@ -21,7 +21,7 @@ env: GO111MODULE: "on" CACHE_BENCHMARK: "off" # Enables benchmark result reuse between runs, may skew latency results. RUN_BASE_BENCHMARK: "on" # Runs benchmark for PR base in case benchmark result is missing. - GO_VERSION: 1.22.x + GO_VERSION: 1.23.x jobs: bench: runs-on: ubuntu-latest diff --git a/templates/github/workflows/golangci-lint.yml b/templates/github/workflows/golangci-lint.yml index 91340c1..9acf314 100644 --- a/templates/github/workflows/golangci-lint.yml +++ b/templates/github/workflows/golangci-lint.yml @@ -21,13 +21,13 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.22.x + go-version: 1.23.x - uses: actions/checkout@v2 - name: golangci-lint - uses: golangci/golangci-lint-action@v6.0.1 + uses: golangci/golangci-lint-action@v6.1.0 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.59.1 + version: v1.61.0 # Optional: working directory, useful for monorepos # working-directory: somedir diff --git a/templates/github/workflows/gorelease.yml b/templates/github/workflows/gorelease.yml index 6356a9d..c031db4 100644 --- a/templates/github/workflows/gorelease.yml +++ b/templates/github/workflows/gorelease.yml @@ -9,7 +9,7 @@ concurrency: cancel-in-progress: true env: - GO_VERSION: 1.22.x + GO_VERSION: 1.23.x jobs: gorelease: runs-on: ubuntu-latest diff --git a/templates/github/workflows/release-assets.yml b/templates/github/workflows/release-assets.yml index 707c346..2686396 100644 --- a/templates/github/workflows/release-assets.yml +++ b/templates/github/workflows/release-assets.yml @@ -8,7 +8,7 @@ on: - created env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GO_VERSION: 1.22.x + GO_VERSION: 1.23.x jobs: build: name: Upload Release Assets diff --git a/templates/github/workflows/test-integration.yml b/templates/github/workflows/test-integration.yml index 44d9ba9..62028b0 100644 --- a/templates/github/workflows/test-integration.yml +++ b/templates/github/workflows/test-integration.yml @@ -16,7 +16,7 @@ env: GO111MODULE: "on" RUN_BASE_COVERAGE: "on" # Runs test for PR base in case base test coverage is missing. DOCKER_COMPOSE_FILE: ./docker-compose.yml - GO_VERSION: 1.22.x + GO_VERSION: 1.23.x TARGET_DELTA_COV: 90 # Target coverage of changed lines, in percents jobs: test: diff --git a/templates/github/workflows/test-unit.yml b/templates/github/workflows/test-unit.yml index 9b6e93d..41ae308 100644 --- a/templates/github/workflows/test-unit.yml +++ b/templates/github/workflows/test-unit.yml @@ -21,7 +21,7 @@ jobs: test: strategy: matrix: - go-version: [ 1.20.x, 1.21.x, 1.22.x ] + go-version: [ 1.21.x, 1.22.x, 1.23.x ] runs-on: ubuntu-latest steps: - name: Install Go stable