diff --git a/.copier-answers.yml b/.copier-answers.yml index c0d5ce2..42ae228 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,9 +1,6 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v1.9.0 +_commit: v1.11.0 _src_path: https://github.com/hugoh/go-tools.git -codecov_ignore: -- main.go -codecov_style: simple cog_omit_types: [] coverage_total: 80 golangci_extra_disable: @@ -24,9 +21,6 @@ has_gen: false has_goreleaser: true has_homebrew_cask: false has_test_int: true -hk_has_golangci_step: true -hk_has_goreleaser_step: false -hk_prepush_with_go_ci: false nfpm_extra_contents: [] project_description: CLI for managing T-Mobile Home Internet gateway and signal monitoring project_name: tmhi-cli @@ -35,5 +29,3 @@ testcoverage_excludes: - main\.go$ testcoverage_overrides: [] - -#copier updated \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8f5ce3..25ffc99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,12 +18,12 @@ permissions: {} jobs: hk: - uses: hugoh/go-tools/.github/workflows/go-hk.yml@a88141d2e3c0572f37476995792146b37c268005 + uses: hugoh/go-tools/.github/workflows/go-hk.yml@410552a1556bdae5a90b32924a517dcebcff0d4e permissions: contents: read goci: - uses: hugoh/go-tools/.github/workflows/go-ci.yml@a88141d2e3c0572f37476995792146b37c268005 + uses: hugoh/go-tools/.github/workflows/go-ci.yml@410552a1556bdae5a90b32924a517dcebcff0d4e permissions: contents: read secrets: @@ -31,7 +31,7 @@ jobs: release: needs: [hk, goci] - uses: hugoh/go-tools/.github/workflows/go-release.yml@a88141d2e3c0572f37476995792146b37c268005 + uses: hugoh/go-tools/.github/workflows/go-release.yml@410552a1556bdae5a90b32924a517dcebcff0d4e permissions: contents: write with: diff --git a/.renovaterc.json b/.renovaterc.json index 97c56b6..028c86a 100644 --- a/.renovaterc.json +++ b/.renovaterc.json @@ -1,4 +1,18 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["github>hugoh/go-tools:go-renovaterc"] + "extends": ["github>hugoh/go-tools:go-renovaterc"], + "packageRules": [ + { + "description": "hk.pkl is Copier-managed (regenerated on every `copier update` from go-tools' template). Let Copier own its version instead of Renovate bumping it directly, to avoid the two racing to update the same file.", + "matchManagers": ["custom.regex"], + "matchFileNames": ["hk.pkl"], + "enabled": false + }, + { + "description": "mise.toml [tools] versions are Copier-managed too (regenerated on every `copier update` from go-tools' template's mise.toml.jinja). Let Copier own tool versions instead of Renovate bumping them directly, to avoid the two racing to update the same file.", + "matchManagers": ["mise"], + "matchFileNames": ["mise.toml"], + "enabled": false + } + ] } diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index becf9ea..0000000 --- a/codecov.yml +++ /dev/null @@ -1,2 +0,0 @@ -ignore: - - main.go diff --git a/hk.pkl b/hk.pkl index cfb2516..ba5d62f 100644 --- a/hk.pkl +++ b/hk.pkl @@ -52,6 +52,9 @@ local linters = new Mapping { ["duplication"] = { check = "cpd" } + ["goreleaser"]= { + check = "goreleaser check" + } } hooks { diff --git a/mise.toml b/mise.toml index 2dac3e4..f5463f3 100644 --- a/mise.toml +++ b/mise.toml @@ -5,24 +5,25 @@ golangci-lint = "2.12.2" goreleaser = "2.17.0" cocogitto = "7.0.0" gotestsum = "1.13.0" -hk = "1.50.0" -shellcheck = "0.11.0" -"aqua:anordal/shellharden" = "4.3.2" -rumdl = "0.2.31" -zizmor = "1.26.1" -dprint = "0.55.1" +hk = "1.51.0" +rumdl = "0.2.34" +zizmor = "1.27.0" +dprint = "0.55.2" ghalint = "1.5.6" gitleaks = "8.30.1" actionlint = "1.7.12" typos = "1.48.0" pinact = "4.1.0" -copier = "9.16.0" +copier = "9.17.0" +jj = "0.43.0" +shellcheck = "0.11.0" +"github:anordal/shellharden" = "4.3.2" +shfmt = "3.13.1" +tombi = "1.2.0" +"github:owenlamont/ryl" = "0.21.0" "npm:cpd" = "5.0.13" "go:golang.org/x/tools/cmd/deadcode" = "0.48.0" "go:golang.org/x/vuln/cmd/govulncheck" = "1.6.0" -"github:owenlamont/ryl" = "0.21.0" -shfmt = "3.13.1" -tombi = "1.2.0" [env] COVEROUT = "cover.out"