chore: update dependecy, CI, and linter

.github/workflows/go-cross.yml

@@ -11,38 +11,19 @@ jobs:
 
  strategy:
  matrix:
- go-version: [ 1.18, 1.x ]
+ go-version: [ olstable, stable ]
  os: [ubuntu-latest, macos-latest, windows-latest]
 
  steps:
- # https://github.com/marketplace/actions/setup-go-environment
- - name: Set up Go ${{ matrix.go-version }}
- uses: actions/setup-go@v2
- with:
- go-version: ${{ matrix.go-version }}
-
  # https://github.com/marketplace/actions/checkout
  - name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
- # https://github.com/marketplace/actions/cache
- - name: Cache Go modules
- uses: actions/cache@v2
+ # https://github.com/marketplace/actions/setup-go-environment
+ - name: Set up Go ${{ matrix.go-version }}
+ uses: actions/setup-go@v5
  with:
- # In order:
- # * Module download cache
- # * Build cache (Linux)
- # * Build cache (Mac)
- # * Build cache (Windows)
- path: |
- ~/go/pkg/mod
- ~/.cache/go-build
- ~/Library/Caches/go-build
- %LocalAppData%\go-build
- key: ${{ runner.os }}-${{ matrix.go-version }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-${{ matrix.go-version }}-go-
-
+ go-version: ${{ matrix.go-version }}
  - name: Test
  run: go test -v -cover ./...
 

.github/workflows/main.yml

@@ -4,8 +4,6 @@ on:
  push:
  branches:
  - master
- tags:
- - v*
  pull_request:
 
 jobs:
@@ -14,32 +12,22 @@ jobs:
  name: Main Process
  runs-on: ubuntu-latest
  env:
- GO_VERSION: 1.18
- GOLANGCI_LINT_VERSION: v1.50.1
+ GO_VERSION: stable
+ GOLANGCI_LINT_VERSION: v1.57.1
  CGO_ENABLED: 0
 
  steps:
-
- # https://github.com/marketplace/actions/setup-go-environment
- - name: Set up Go ${{ env.GO_VERSION }}
- uses: actions/setup-go@v2
- with:
- go-version: ${{ env.GO_VERSION }}
-
  # https://github.com/marketplace/actions/checkout
  - name: Check out code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
  with:
  fetch-depth: 0
 
- # https://github.com/marketplace/actions/cache
- - name: Cache Go modules
- uses: actions/cache@v2
+ # https://github.com/marketplace/actions/setup-go-environment
+ - name: Set up Go ${{ env.GO_VERSION }}
+ uses: actions/setup-go@v5
  with:
- path: ~/go/pkg/mod
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-go-
+ go-version: ${{ env.GO_VERSION }}
 
  - name: Check and get dependencies
  run: |

.golangci.yml

@@ -1,7 +1,5 @@
 run:
- deadline: 2m
- skip-files: []
- skip-dirs: []
+ timeout: 2m
 
 linters-settings:
  govet:
@@ -16,10 +14,13 @@ linters-settings:
  gofumpt:
  extra-rules: true
  depguard:
- list-type: blacklist
- include-go-root: false
- packages:
- - github.com/pkg/errors
+ rules:
+ main:
+ deny:
+ - pkg: "github.com/instana/testify"
+ desc: not allowed
+ - pkg: "github.com/pkg/errors"
+ desc: Should be replaced by standard lib errors package
  godox:
  keywords:
  - FIXME
@@ -83,7 +84,7 @@ linters:
 
 issues:
  exclude-use-default: false
- max-per-linter: 0
+ max-issues-per-linter: 0
  max-same-issues: 0
  exclude: [
  'package-comments: should have a package comment'
@@ -95,3 +96,7 @@ issues:
  - goconst
  - path: cmd/gomoddirectives/gomoddirectives.go
  text: 'use of `fmt.Println` forbidden'
+
+output:
+ show-stats: true
+ sort-results: true

Makefile

@@ -12,4 +12,4 @@ check:
  golangci-lint run
 
 build:
- go build -v -ldflags "-s -w" -trimpath ./cmd/gomoddirectives/
+ go build -ldflags "-s -w" -trimpath ./cmd/gomoddirectives/

go.mod

@@ -1,10 +1,10 @@
 module github.com/ldez/gomoddirectives
 
-go 1.18
+go 1.21
 
 require (
- github.com/stretchr/testify v1.8.1
- golang.org/x/mod v0.7.0
+ github.com/stretchr/testify v1.9.0
+ golang.org/x/mod v0.16.0
 )
 
 require (

go.sum

@@ -1,19 +1,12 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=