From fd4b10afeb1f73020ed08a11b2fd34df80f4d419 Mon Sep 17 00:00:00 2001 From: Hugo Haas Date: Tue, 1 Sep 2026 21:54:25 -0500 Subject: [PATCH] chore(deps): update copier template to go-tools v1.22.0 Reformatted files flagged by the template's stricter gofumpt rules. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01GEZPV5UVAHZFpG2xG4BE62 --- .copier-answers.yml | 2 +- .editorconfig | 1 + .github/workflows/ci.yml | 7 ++++--- .golangci.yml | 7 +++++++ .goreleaser.yml | 1 + .jscpd.json | 1 + .markdownlint.json | 1 + .renovaterc.json | 1 + .testcoverage.yml | 1 + biome.json | 8 -------- biome.jsonc | 15 +++++++++++++++ cog.toml | 1 + hk.pkl | 7 ++++--- internal/cmd_handlers_test.go | 2 +- mise-tasks/build | 1 + mise-tasks/ci | 1 + mise-tasks/ci-core | 1 + mise-tasks/clean | 1 + mise-tasks/coverage | 1 + mise-tasks/depup | 1 + mise-tasks/dev | 1 + mise-tasks/fix | 1 + mise-tasks/format | 1 + mise-tasks/full-check | 1 + mise-tasks/lint | 1 + mise-tasks/lint-deadcode | 1 + mise-tasks/lint-go | 1 + mise-tasks/lint-mod | 1 + mise-tasks/lint-release | 1 + mise-tasks/lint-vuln | 1 + mise-tasks/test | 1 + mise-tasks/test-int | 1 + mise-tasks/tidy | 1 + mise.toml | 21 +++++++++++---------- 34 files changed, 69 insertions(+), 26 deletions(-) delete mode 100644 biome.json create mode 100644 biome.jsonc diff --git a/.copier-answers.yml b/.copier-answers.yml index c8f60bb..7db66f4 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v1.19.0 +_commit: v1.22.0 _src_path: https://github.com/hugoh/go-tools.git coverage_total: 80 golangci_extra_disable: [] diff --git a/.editorconfig b/.editorconfig index 91772ef..fe1e16f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,4 @@ +# DO NOT EDIT — managed by hugoh/go-tools via copier. root = true [mise-tasks/*] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0dd16cb..b61dcec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,3 +1,4 @@ +# DO NOT EDIT — managed by hugoh/go-tools via copier. --- name: CI @@ -18,18 +19,18 @@ permissions: {} jobs: hk: - uses: hugoh/go-tools/.github/workflows/go-hk.yml@37285d93779492692decb112f28f287551effedd + uses: hugoh/go-tools/.github/workflows/go-hk.yml@2ce644c50c3878427a4fb98ca076ad3c3463f016 # v1.22.0 permissions: contents: read goci: - uses: hugoh/go-tools/.github/workflows/go-ci.yml@37285d93779492692decb112f28f287551effedd + uses: hugoh/go-tools/.github/workflows/go-ci.yml@2ce644c50c3878427a4fb98ca076ad3c3463f016 # v1.22.0 permissions: contents: read release: needs: [hk, goci] - uses: hugoh/go-tools/.github/workflows/go-release.yml@37285d93779492692decb112f28f287551effedd + uses: hugoh/go-tools/.github/workflows/go-release.yml@2ce644c50c3878427a4fb98ca076ad3c3463f016 # v1.22.0 permissions: contents: write with: diff --git a/.golangci.yml b/.golangci.yml index b697413..34afb05 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,3 +1,4 @@ +# DO NOT EDIT — managed by hugoh/go-tools via copier. version: "2" linters: default: all @@ -23,3 +24,9 @@ formatters: - gofumpt - goimports - golines + settings: + gofumpt: + extra: + group-params: true + clothe-returns: true + balance-calls: true diff --git a/.goreleaser.yml b/.goreleaser.yml index 1c99716..7bb212d 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,4 @@ +# DO NOT EDIT — managed by hugoh/go-tools via copier. version: 2 builds: diff --git a/.jscpd.json b/.jscpd.json index 1af50f7..79027b2 100644 --- a/.jscpd.json +++ b/.jscpd.json @@ -1,4 +1,5 @@ { + "//": "DO NOT EDIT — managed by hugoh/go-tools via copier.", "minLines": 8, "threshold": 3 } diff --git a/.markdownlint.json b/.markdownlint.json index 67d2ae5..389b25c 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -1,3 +1,4 @@ { + "//": "DO NOT EDIT — managed by hugoh/go-tools via copier.", "MD013": false } diff --git a/.renovaterc.json b/.renovaterc.json index 4d2a8ac..7bae5e9 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -1,4 +1,5 @@ { + // DO NOT EDIT — managed by hugoh/go-tools via copier. "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "github>hugoh/go-tools:go-renovaterc", diff --git a/.testcoverage.yml b/.testcoverage.yml index 26e553e..2ff4cb1 100644 --- a/.testcoverage.yml +++ b/.testcoverage.yml @@ -1,3 +1,4 @@ +# DO NOT EDIT — managed by hugoh/go-tools via copier. profile: cover.out threshold: diff --git a/biome.json b/biome.json deleted file mode 100644 index 8c6aefe..0000000 --- a/biome.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "$schema": "https://biomejs.dev/schemas/2.5.4/schema.json", - "formatter": { - "enabled": true, - "indentStyle": "space", - "indentWidth": 2 - } -} diff --git a/biome.jsonc b/biome.jsonc new file mode 100644 index 0000000..c1ad6b1 --- /dev/null +++ b/biome.jsonc @@ -0,0 +1,15 @@ +{ + // DO NOT EDIT — managed by hugoh/go-tools via copier. + "$schema": "https://biomejs.dev/schemas/2.5.4/schema.json", + "formatter": { + "enabled": true, + "indentStyle": "space", + "indentWidth": 2 + }, + "overrides": [ + { + "includes": ["**/.renovaterc.json"], + "json": { "parser": { "allowComments": true } } + } + ] +} diff --git a/cog.toml b/cog.toml index 165c6c1..c1c8f6a 100644 --- a/cog.toml +++ b/cog.toml @@ -1,3 +1,4 @@ +# DO NOT EDIT — managed by hugoh/go-tools via copier. tag_prefix = "v" disable_changelog = true disable_bump_commit = true diff --git a/hk.pkl b/hk.pkl index 8badada..7371b8a 100644 --- a/hk.pkl +++ b/hk.pkl @@ -1,6 +1,7 @@ -amends "package://github.com/jdx/hk/releases/download/v1.56.0/hk@1.56.0#/Config.pkl" -import "package://github.com/jdx/hk/releases/download/v1.56.0/hk@1.56.0#/Builtins.pkl" -import "package://github.com/hugoh/hk-config/releases/download/v1.4.1/hk-config@1.4.1#/base.pkl" as Base +// DO NOT EDIT — managed by hugoh/go-tools via copier. +amends "package://github.com/jdx/hk/releases/download/v1.57.0/hk@1.57.0#/Config.pkl" +import "package://github.com/jdx/hk/releases/download/v1.57.0/hk@1.57.0#/Builtins.pkl" +import "package://github.com/hugoh/hk-config/releases/download/v1.7.0/hk-config@1.7.0#/base.pkl" as Base min_hk_version = Base.min_hk_version diff --git a/internal/cmd_handlers_test.go b/internal/cmd_handlers_test.go index 2f09201..eeb044d 100644 --- a/internal/cmd_handlers_test.go +++ b/internal/cmd_handlers_test.go @@ -262,7 +262,7 @@ func TestReboot_ConfirmationDefaultsToNo(t *testing.T) { }) } -func testRebootConfirm(t *testing.T, confirmResult bool, expectCalled bool, msg string) { +func testRebootConfirm(t *testing.T, confirmResult, expectCalled bool, msg string) { t.Helper() mg := &mockGateway{} diff --git a/mise-tasks/build b/mise-tasks/build index 0b433eb..19ceb4d 100755 --- a/mise-tasks/build +++ b/mise-tasks/build @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Build application" #MISE sources=["**/*.go", "go.mod", "go.sum"] go build -o "dist/$(basename "$(go list -m | sed -E 's|/v[0-9]+$||')")" . diff --git a/mise-tasks/ci b/mise-tasks/ci index 97fb775..e5336ea 100755 --- a/mise-tasks/ci +++ b/mise-tasks/ci @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Run full CI pipeline (lint, tests, coverage, build)" #MISE depends=["lint", "ci-core", "build"] true diff --git a/mise-tasks/ci-core b/mise-tasks/ci-core index 5631160..a3c53f1 100755 --- a/mise-tasks/ci-core +++ b/mise-tasks/ci-core @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Run core CI checks (test, coverage, integration)" #MISE depends=["coverage", "test-int"] true diff --git a/mise-tasks/clean b/mise-tasks/clean index e2f3049..ee405f2 100755 --- a/mise-tasks/clean +++ b/mise-tasks/clean @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Clean the project" go clean rm -f "$COVEROUT" diff --git a/mise-tasks/coverage b/mise-tasks/coverage index 44a324c..142f109 100755 --- a/mise-tasks/coverage +++ b/mise-tasks/coverage @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Check test coverage" #MISE depends=["test"] go-test-coverage -config .testcoverage.yml diff --git a/mise-tasks/depup b/mise-tasks/depup index e8661bf..dde8213 100755 --- a/mise-tasks/depup +++ b/mise-tasks/depup @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Upgrade dependencies" set -e go get -u -t ./... diff --git a/mise-tasks/dev b/mise-tasks/dev index d6d8f30..15cc8d4 100755 --- a/mise-tasks/dev +++ b/mise-tasks/dev @@ -1,3 +1,4 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Development mode" go run . "$@" diff --git a/mise-tasks/fix b/mise-tasks/fix index 4d45ac6..b546fd9 100755 --- a/mise-tasks/fix +++ b/mise-tasks/fix @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Lint and fix code" set -e mise run lint-mod diff --git a/mise-tasks/format b/mise-tasks/format index 2f25a58..09d9c89 100755 --- a/mise-tasks/format +++ b/mise-tasks/format @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Format the code" #MISE sources=["**/*.go", "**/*.json", "**/*.md", "**/*.toml", "**/*.yaml", "**/*.yml"] set -e diff --git a/mise-tasks/full-check b/mise-tasks/full-check index b4fac17..9dd1046 100755 --- a/mise-tasks/full-check +++ b/mise-tasks/full-check @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Run full pre-commit validation (format, fix, core CI)" set -e mise run format diff --git a/mise-tasks/lint b/mise-tasks/lint index 1c25cef..3abcb7a 100755 --- a/mise-tasks/lint +++ b/mise-tasks/lint @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Lint code, check dead code" #MISE depends=["lint-mod", "lint-deadcode --test", "lint-vuln", "lint-go", "lint-release"] true diff --git a/mise-tasks/lint-deadcode b/mise-tasks/lint-deadcode index e89a6ed..5479b14 100755 --- a/mise-tasks/lint-deadcode +++ b/mise-tasks/lint-deadcode @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Check for dead code" #MISE sources=["**/*.go"] #USAGE flag "--test" help="Include test files" diff --git a/mise-tasks/lint-go b/mise-tasks/lint-go index ebb78db..a83d078 100755 --- a/mise-tasks/lint-go +++ b/mise-tasks/lint-go @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Lint Go source" #MISE sources=["**/*.go"] #USAGE flag "--fix" help="Automatically fix issues" diff --git a/mise-tasks/lint-mod b/mise-tasks/lint-mod index c1c99b7..6da1d2a 100755 --- a/mise-tasks/lint-mod +++ b/mise-tasks/lint-mod @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Check go.mod tidiness" #MISE sources=["go.mod", "**/*.go"] go mod tidy -diff diff --git a/mise-tasks/lint-release b/mise-tasks/lint-release index 4189034..ff456ad 100755 --- a/mise-tasks/lint-release +++ b/mise-tasks/lint-release @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Check release config if present" #MISE sources=[".goreleaser.yml"] set -uo pipefail diff --git a/mise-tasks/lint-vuln b/mise-tasks/lint-vuln index cc16be3..61357e6 100755 --- a/mise-tasks/lint-vuln +++ b/mise-tasks/lint-vuln @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Scan dependencies for known vulnerabilities" #MISE sources=["go.mod", "go.sum"] govulncheck ./... diff --git a/mise-tasks/test b/mise-tasks/test index 63e4d06..513cf2e 100755 --- a/mise-tasks/test +++ b/mise-tasks/test @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Run tests with coverage" #MISE sources=["go.mod", "**/*.go"] gotestsum -- -race -shuffle=on -coverprofile="$COVEROUT" -covermode=atomic ./... diff --git a/mise-tasks/test-int b/mise-tasks/test-int index efe1592..93c5315 100755 --- a/mise-tasks/test-int +++ b/mise-tasks/test-int @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Run integration tests" #MISE sources=["go.mod", "**/*.go"] test ! -d internal || gotestsum -- -race -tags=integration ./internal/... diff --git a/mise-tasks/tidy b/mise-tasks/tidy index 2005aaa..a5f520d 100755 --- a/mise-tasks/tidy +++ b/mise-tasks/tidy @@ -1,3 +1,4 @@ #!/usr/bin/env bash +# DO NOT EDIT — managed by hugoh/go-tools via copier. #MISE description="Tidy the module" go mod tidy -v diff --git a/mise.toml b/mise.toml index b7c6320..2df3d2e 100644 --- a/mise.toml +++ b/mise.toml @@ -1,30 +1,31 @@ +# DO NOT EDIT — managed by hugoh/go-tools via copier. [tools] go = "1.27.0" -golangci-lint = "2.13.1" +golangci-lint = "2.13.2" gotestsum = "1.13.0" "go:github.com/vladopajic/go-test-coverage/v2" = "2.19.0" "go:golang.org/x/tools/cmd/deadcode" = "0.49.0" "go:golang.org/x/vuln/cmd/govulncheck" = "1.7.0" # -goreleaser = "2.17.1" +goreleaser = "2.18.0" # cocogitto = "7.0.0" -hk = "1.52.0" -rumdl = "0.2.34" -zizmor = "1.27.0" +hk = "1.57.0" +rumdl = "0.2.60" +zizmor = "1.29.0" biome = "2.5.4" ghalint = "1.5.6" gitleaks = "8.30.1" actionlint = "1.7.12" -typos = "1.48.0" -pinact = "4.1.0" -copier = "9.17.0" +pinact = "4.1.1" +typos = "1.49.0" +copier = "9.17.2" shellcheck = "0.11.0" "github:anordal/shellharden" = "4.3.2" shfmt = "3.13.1" -tombi = "1.2.0" +tombi = "1.4.1" "github:owenlamont/ryl" = "0.21.0" -"npm:cpd" = "5.0.10" +"npm:cpd" = "5.0.16" [env] COVEROUT = "cover.out"