chore(deps): update docker.io/library/alpine docker tag to v3.20 (#72)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.golangci.yml

@@ -23,7 +23,6 @@ linters:
     - errchkjson
     - errname
     - errorlint
-    - execinquery
     # - exhaustive
     - exportloopref
     - forcetypeassert
@@ -37,12 +36,12 @@ linters:
     - gocyclo
     - godot
     # - godox
-    - goerr113
+    - err113
     - gofmt
     - gofumpt
     - goheader
     - goimports
-    - gomnd
+    - mnd
     - gomoddirectives
     - gomodguard
     - goprintffuncname

.woodpecker/build-container.yml

@@ -7,7 +7,7 @@ when:
 
 steps:
   - name: dryrun
-    image: quay.io/thegeeklab/wp-docker-buildx:2
+    image: quay.io/thegeeklab/wp-docker-buildx:4
     settings:
       containerfile: Containerfile.multiarch
       dry_run: true
@@ -20,7 +20,7 @@ steps:
       - event: [pull_request]
 
   - name: publish-dockerhub
-    image: quay.io/thegeeklab/wp-docker-buildx:2
+    image: quay.io/thegeeklab/wp-docker-buildx:4
     group: container
     settings:
       auto_tag: true
@@ -41,7 +41,7 @@ steps:
           - ${CI_REPO_DEFAULT_BRANCH}
 
   - name: publish-quay
-    image: quay.io/thegeeklab/wp-docker-buildx:2
+    image: quay.io/thegeeklab/wp-docker-buildx:4
     group: container
     settings:
       auto_tag: true

.woodpecker/build-package.yml

@@ -7,7 +7,7 @@ when:
 
 steps:
   - name: build
-    image: docker.io/techknowlogick/xgo:go-1.21.x
+    image: docker.io/techknowlogick/xgo:go-1.22.x
     commands:
       - ln -s $(pwd) /source
       - make release

.woodpecker/test.yml

@@ -7,11 +7,11 @@ when:
 
 steps:
   - name: lint
-    image: docker.io/library/golang:1.21
+    image: docker.io/library/golang:1.22
     commands:
       - make lint
 
   - name: test
-    image: docker.io/library/golang:1.21
+    image: docker.io/library/golang:1.22
     commands:
       - make test

Containerfile.multiarch

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.21@sha256:672a2286da3ee7a854c3e0a56e0838918d0dbb1c18652992930293312de898a6 as build
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.22@sha256:f43c6f049f04cbbaeb28f0aad3eea15274a7d0a7899a617d0037aec48d7ab010 as build
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -8,7 +8,7 @@ WORKDIR /src
 
 RUN make build
 
-FROM alpine:3.19@sha256:51b67269f354137895d43f3b3d810bfacd3945438e94dc5ac55fdac340352f48
+FROM docker.io/library/alpine:3.20@sha256:77726ef6b57ddf65bb551896826ec38bc3e53f75cdde31354fbffb4f25238ebd
 
 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"

Makefile

@@ -1,7 +1,7 @@
 # renovate: datasource=github-releases depName=mvdan/gofumpt
-GOFUMPT_PACKAGE_VERSION := v0.5.0
+GOFUMPT_PACKAGE_VERSION := v0.6.0
 # renovate: datasource=github-releases depName=golangci/golangci-lint
-GOLANGCI_LINT_PACKAGE_VERSION := v1.55.2
+GOLANGCI_LINT_PACKAGE_VERSION := v1.59.0
 
 EXECUTABLE := git-sv
 
@@ -20,7 +20,7 @@ XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 GOTESTSUM_PACKAGE ?= gotest.tools/gotestsum@latest
 
 GENERATE ?=
-XGO_VERSION := go-1.21.x
+XGO_VERSION := go-1.22.x
 XGO_TARGETS ?= linux/amd64,linux/arm-6,linux/arm-7,linux/arm64
 
 TARGETOS ?= linux

app/commands/changelog.go

@@ -14,7 +14,7 @@ func ChangelogFlags(settings *app.ChangelogSettings) []cli.Flag {
 	return []cli.Flag{
 		&cli.IntFlag{
 			Name:        "size",
-			Value:       10, //nolint:gomnd
+			Value:       10, //nolint:mnd
 			Aliases:     []string{"n"},
 			Destination: &settings.Size,
 			Usage:       "get changelog from last 'n' tags",
@@ -45,7 +45,7 @@ func ChangelogFlags(settings *app.ChangelogSettings) []cli.Flag {
 
 //nolint:gocognit
 func ChangelogHandler(g app.GitSV, settings *app.ChangelogSettings) cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		tags, err := g.Tags()
 		if err != nil {
 			return err

app/commands/commitlog.go

@@ -49,7 +49,7 @@ func CommitLogFlags(settings *app.CommitLogSettings) []cli.Flag {
 }
 
 func CommitLogHandler(g app.GitSV, settings *app.CommitLogSettings) cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		var (
 			commits []sv.CommitLog
 			err     error

app/commands/commitnotes.go

@@ -39,7 +39,7 @@ func CommitNotesFlags(settings *app.CommitNotesSettings) []cli.Flag {
 }
 
 func CommitNotesHandler(g app.GitSV, settings *app.CommitNotesSettings) cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		var date time.Time
 
 		lr, err := logRange(g, settings.Range, settings.Start, settings.End)

app/commands/config.go

@@ -9,7 +9,7 @@ import (
 )
 
 func ConfigDefaultHandler() cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		cfg := app.GetDefault()
 
 		content, err := yaml.Marshal(&cfg)
@@ -24,7 +24,7 @@ func ConfigDefaultHandler() cli.ActionFunc {
 }
 
 func ConfigShowHandler(cfg *app.Config) cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		content, err := yaml.Marshal(cfg)
 		if err != nil {
 			return err

app/commands/currentversion.go

@@ -9,7 +9,7 @@ import (
 )
 
 func CurrentVersionHandler(gsv app.GitSV) cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		lastTag := gsv.LastTag()
 
 		currentVer, err := sv.ToVersion(lastTag)

app/commands/nextversion.go

@@ -10,7 +10,7 @@ import (
 )
 
 func NextVersionHandler(g app.GitSV) cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		lastTag := g.LastTag()
 
 		currentVer, err := sv.ToVersion(lastTag)

app/commands/releasenotes.go

@@ -31,7 +31,7 @@ func ReleaseNotesFlags(settings *app.ReleaseNotesSettings) []cli.Flag {
 }
 
 func ReleaseNotesHandler(g app.GitSV, settings *app.ReleaseNotesSettings) cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		var (
 			commits   []sv.CommitLog
 			rnVersion *semver.Version

app/commands/tag.go

@@ -26,7 +26,7 @@ func TagFlags(settings *app.TagSettings) []cli.Flag {
 }
 
 func TagHandler(g app.GitSV, settings *app.TagSettings) cli.ActionFunc {
-	return func(c *cli.Context) error {
+	return func(_ *cli.Context) error {
 		lastTag := g.LastTag()
 
 		currentVer, err := sv.ToVersion(lastTag)

app/config_test.go

@@ -148,6 +148,7 @@ func Test_merge(t *testing.T) {
 			if err := merge(&tt.dst, tt.src); (err != nil) != tt.wantErr {
 				t.Errorf("merge() error = %v, wantErr %v", err, tt.wantErr)
 			}
+
 			if !reflect.DeepEqual(tt.dst, tt.want) {
 				t.Errorf("merge() = %v, want %v", tt.dst, tt.want)
 			}

cmd/git-sv/main.go

@@ -38,7 +38,7 @@ func main() {
 				Destination: &gsv.Settings.LogLevel,
 			},
 		},
-		Before: func(ctx *cli.Context) error {
+		Before: func(_ *cli.Context) error {
 			lvl, err := zerolog.ParseLevel(gsv.Settings.LogLevel)
 			if err != nil {
 				return err

go.mod

@@ -1,21 +1,21 @@
 module github.com/thegeeklab/git-sv
 
-go 1.21
+go 1.22
 
 require (
 	dario.cat/mergo v1.0.0
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/manifoldco/promptui v0.9.0
-	github.com/rs/zerolog v1.31.0
-	github.com/urfave/cli/v2 v2.27.1
+	github.com/rs/zerolog v1.33.0
+	github.com/urfave/cli/v2 v2.27.2
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/google/uuid v1.3.1 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
@@ -27,7 +27,7 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

go.sum

@@ -17,8 +17,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
 github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
 github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 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=
@@ -62,8 +62,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
-github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -76,10 +76,10 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
-github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+github.com/urfave/cli/v2 v2.27.2 h1:6e0H+AkS+zDckwPCUrZkKX38mRaau4nL2uipkJpbkcI=
+github.com/urfave/cli/v2 v2.27.2/go.mod h1:g0+79LmHHATl7DAcHO99smiR/T7uGLw84w8Y42x+4eM=
+github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
+github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=

sv/commit_test.go

@@ -115,9 +115,11 @@ func TestSemVerCommitProcessor_NextVersion(t *testing.T) {
 				},
 				CommitMessageConfig{Types: []string{"major", "minor", "patch", "none"}})
 			got, gotUpdated := p.NextVersion(tt.version, tt.commits)
+
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("SemVerCommitProcessor.NextVersion() Version = %v, want %v", got, tt.want)
 			}
+
 			if tt.wantUpdated != gotUpdated {
 				t.Errorf("SemVerCommitProcessor.NextVersion() Updated = %v, want %v", gotUpdated, tt.wantUpdated)
 			}
@@ -144,6 +146,7 @@ func TestToVersion(t *testing.T) {
 
 				return
 			}
+
 			if !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("ToVersion() = %v, want %v", got, tt.want)
 			}

sv/formatter/formatter_test.go

@@ -114,6 +114,7 @@ func Test_checkTemplatesExecution(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.template, func(t *testing.T) {
 			var b bytes.Buffer
+
 			err := tpls.ExecuteTemplate(&b, tt.template, tt.variables)
 			if err != nil {
 				t.Errorf("invalid template err = %v", err)

sv/message.go

@@ -249,7 +249,7 @@ func (p BaseMessageProcessor) IssueID(branch string) (string, error) {
 	}
 
 	groups := r.FindStringSubmatch(branch)
-	if len(groups) != 4 { //nolint:gomnd
+	if len(groups) != 4 { //nolint:mnd
 		return "", nil
 	}
 
@@ -360,7 +360,7 @@ func parseSubjectMessage(message string) (string, string, string, bool) {
 	regex := regexp.MustCompile(`([a-z]+)(\((.*)\))?(!)?: (.*)`)
 
 	result := regex.FindStringSubmatch(message)
-	if len(result) != 6 { //nolint:gomnd
+	if len(result) != 6 { //nolint:mnd
 		return "", "", message, false
 	}
 
@@ -375,7 +375,7 @@ func extractFooterMetadata(key, text string, useHash bool) string {
 	}
 
 	result := regex.FindStringSubmatch(text)
-	if len(result) < 2 { //nolint:gomnd
+	if len(result) < 2 { //nolint:mnd
 		return ""
 	}
 
@@ -392,6 +392,7 @@ func hasFooter(message string) bool {
 		if lines > 0 && r.MatchString(scanner.Text()) {
 			return true
 		}
+
 		lines++
 	}
 

sv/message_test.go

@@ -385,6 +385,7 @@ func TestBaseMessageProcessor_Enhance(t *testing.T) {
 
 				return
 			}
+
 			if got != tt.want {
 				t.Errorf("BaseMessageProcessor.Enhance() = %v, want %v", got, tt.want)
 			}
@@ -416,6 +417,7 @@ func TestBaseMessageProcessor_IssueID(t *testing.T) {
 
 				return
 			}
+
 			if got != tt.want {
 				t.Errorf("BaseMessageProcessor.IssueID() = %v, want %v", got, tt.want)
 			}
@@ -781,9 +783,11 @@ func TestBaseMessageProcessor_Format(t *testing.T) {
 			if got != tt.wantHeader {
 				t.Errorf("BaseMessageProcessor.Format() header got = %v, want %v", got, tt.wantHeader)
 			}
+
 			if got1 != tt.wantBody {
 				t.Errorf("BaseMessageProcessor.Format() body got = %v, want %v", got1, tt.wantBody)
 			}
+
 			if got2 != tt.wantFooter {
 				t.Errorf("BaseMessageProcessor.Format() footer got = %v, want %v", got2, tt.wantFooter)
 			}
@@ -815,6 +819,7 @@ func Test_splitCommitMessageContent(t *testing.T) {
 			if got != tt.wantSubject {
 				t.Errorf("splitCommitMessageContent() subject got = %v, want %v", got, tt.wantSubject)
 			}
+
 			if got1 != tt.wantBody {
 				t.Errorf("splitCommitMessageContent() body got1 = [%v], want [%v]", got1, tt.wantBody)
 			}
@@ -842,12 +847,15 @@ func Test_parseSubjectMessage(t *testing.T) {
 			if ctype != tt.wantType {
 				t.Errorf("parseSubjectMessage() type got = %v, want %v", ctype, tt.wantType)
 			}
+
 			if scope != tt.wantScope {
 				t.Errorf("parseSubjectMessage() scope got = %v, want %v", scope, tt.wantScope)
 			}
+
 			if description != tt.wantDescription {
 				t.Errorf("parseSubjectMessage() description got = %v, want %v", description, tt.wantDescription)
 			}
+
 			if hasBreakingChange != tt.wantHasBreakingChange {
 				t.Errorf("parseSubjectMessage() hasBreakingChange got = %v, want %v", hasBreakingChange, tt.wantHasBreakingChange)
 			}
@@ -913,7 +921,7 @@ func Test_prepareHeader(t *testing.T) {
 		},
 		{
 			"matching non-conventional with invalid regex",
-			"Merged PR (\\d+): (?<header>.*)",
+			"Merged PR (\\d+): (<header>.*)",
 			"Merged PR 123: something",
 			"",
 			true,
@@ -927,6 +935,7 @@ func Test_prepareHeader(t *testing.T) {
 			if tt.wantError && err == nil {
 				t.Errorf("prepareHeader() err got = %v, want not nil", err)
 			}
+
 			if header != tt.wantHeader {
 				t.Errorf("prepareHeader() header got = %v, want %v", header, tt.wantHeader)
 			}