diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 3a7d978..86c395e 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' cache: false - name: golangci-lint uses: golangci/golangci-lint-action@v3 @@ -26,7 +26,7 @@ jobs: # Require: The version of golangci-lint to use. # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version. # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit. - version: v1.57 + version: v1.60 # Optional: working directory, useful for monorepos # working-directory: somedir diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 04b35ec..eaad554 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: '1.22.x' + go-version: '1.23.x' - name: Install dependencies run: go mod download - name: Test with the Go CLI diff --git a/.golangci.yml b/.golangci.yml index 5335982..dc89d3f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,4 +5,5 @@ linters: - staticcheck - govet output: - format: github-actions + formats: + - format: colored-line-number diff --git a/Dockerfile b/Dockerfile index 0a73dde..c7dcd77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Copyright 2022 - offen.software # SPDX-License-Identifier: MPL-2.0 -FROM golang:1.22-alpine as builder +FROM golang:1.23-alpine as builder WORKDIR /app COPY . . diff --git a/go.mod b/go.mod index 34fc601..9b29e21 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/offen/docker-volume-backup -go 1.22 +go 1.23 require ( filippo.io/age v1.2.0 diff --git a/internal/errwrap/wrap.go b/internal/errwrap/wrap.go index a64142b..a3b48d5 100644 --- a/internal/errwrap/wrap.go +++ b/internal/errwrap/wrap.go @@ -21,7 +21,7 @@ func Wrap(err error, msg string) error { chunks := strings.Split(frame.Function, "/") withCaller := fmt.Sprintf("%s: %s", chunks[len(chunks)-1], msg) if err == nil { - return fmt.Errorf(withCaller) + return errors.New(withCaller) } return fmt.Errorf("%s: %w", withCaller, err) }