diff --git a/.copier-answers.yml b/.copier-answers.yml index b03487c..73c0c2a 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,8 +1,6 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v1.15.1 +_commit: v1.15.3 _src_path: https://github.com/hugoh/go-tools.git -cog_omit_types: -- lint coverage_total: 80 golangci_extra_disable: - depguard diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5ae4bd..fafdb85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,18 +18,18 @@ permissions: {} jobs: hk: - uses: hugoh/go-tools/.github/workflows/go-hk.yml@3a5ed7a29b7050910c88e017ac557659234e3230 + uses: hugoh/go-tools/.github/workflows/go-hk.yml@8e26d75a74a7078a77ff31f6a844f8bbf8ad0729 permissions: contents: read goci: - uses: hugoh/go-tools/.github/workflows/go-ci.yml@3a5ed7a29b7050910c88e017ac557659234e3230 + uses: hugoh/go-tools/.github/workflows/go-ci.yml@8e26d75a74a7078a77ff31f6a844f8bbf8ad0729 permissions: contents: read release: needs: [hk, goci] - uses: hugoh/go-tools/.github/workflows/go-release.yml@3a5ed7a29b7050910c88e017ac557659234e3230 + uses: hugoh/go-tools/.github/workflows/go-release.yml@8e26d75a74a7078a77ff31f6a844f8bbf8ad0729 permissions: contents: write with: diff --git a/cog.toml b/cog.toml index 407379c..5490d0e 100644 --- a/cog.toml +++ b/cog.toml @@ -2,6 +2,3 @@ tag_prefix = "v" disable_changelog = true disable_bump_commit = true ignore_merge_commits = true - -[commit_types] -lint = { omit_from_changelog = true } diff --git a/hk.pkl b/hk.pkl index 5aaea4e..d78ffae 100644 --- a/hk.pkl +++ b/hk.pkl @@ -1,6 +1,6 @@ amends "package://github.com/jdx/hk/releases/download/v1.52.0/hk@1.52.0#/Config.pkl" import "package://github.com/jdx/hk/releases/download/v1.52.0/hk@1.52.0#/Builtins.pkl" -import "package://github.com/hugoh/hk-config/releases/download/v1.1.0/hk-config@1.1.0#/base.pkl" as Base +import "package://github.com/hugoh/hk-config/releases/download/v1.2.0/hk-config@1.2.0#/base.pkl" as Base min_hk_version = Base.min_hk_version @@ -9,7 +9,7 @@ local linters = new Mapping { ...Base.shell // go generate output can legitimately end without touching trailing // whitespace elsewhere in the file; base's check conflicts with that - ["trailing-ws"] = (Builtins.trailing_whitespace) { + ["trailing_whitespace"] = (Builtins.trailing_whitespace) { condition = "false" } // hugoh/go-tools' own self-referential workflow pins are rendered by this @@ -30,19 +30,19 @@ local linters = new Mapping { } // Same copier-serializer quirk as above: it omits the trailing newline // ryl's new-line-at-end-of-file rule expects - ["yaml"] = (Builtins.ryl) { + ["ryl"] = (Builtins.ryl) { exclude = List(".copier-answers.yml") } - ["golangci-lint-config"] = { + ["golangci_lint_config"] = { check = "golangci-lint config verify" } - ["golangci-lint"] = (Builtins.golangci_lint) { + ["golangci_lint"] = (Builtins.golangci_lint) { profiles = List("!ci") } - ["gomod-tidy"] = (Builtins.gomod_tidy) { + ["gomod_tidy"] = (Builtins.gomod_tidy) { profiles = List("!ci") } - ["conventional-commit"] { + ["conventional_commit"] { check = "cog check --from-latest-tag" } ["govulncheck"] = { @@ -74,7 +74,6 @@ hooks { } ["commit-msg"] { steps = new Mapping { - ["check-conventional-commit"] = Builtins.check_conventional_commit ["cocogitto_commit_msg"] = Builtins.cocogitto_commit_msg } } diff --git a/mise-tasks/lint-deadcode b/mise-tasks/lint-deadcode index e89a6ed..a3feda9 100755 --- a/mise-tasks/lint-deadcode +++ b/mise-tasks/lint-deadcode @@ -5,6 +5,6 @@ flags=() [ "${usage_test:-}" != "" ] && flags+=(-test) if deadcode "${flags[@]}" ./... 2>&1 | grep .; then - echo 'dead code found' - exit 1 + echo 'dead code found' + exit 1 fi