Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v1.15.1
_commit: v1.16.0
_src_path: https://github.com/hugoh/go-tools.git
cog_omit_types: []
coverage_total: 80
golangci_extra_disable:
- depguard
Expand Down
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true

[mise-tasks/*]
indent_size = 2
indent_style = space
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@c71b73445cc92e9edbc7b98c1b17adc69c5649dd
permissions:
contents: read

goci:
uses: hugoh/go-tools/.github/workflows/go-ci.yml@3a5ed7a29b7050910c88e017ac557659234e3230
uses: hugoh/go-tools/.github/workflows/go-ci.yml@c71b73445cc92e9edbc7b98c1b17adc69c5649dd
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@c71b73445cc92e9edbc7b98c1b17adc69c5649dd
permissions:
contents: write
with:
Expand Down
15 changes: 7 additions & 8 deletions hk.pkl
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -9,7 +9,7 @@ local linters = new Mapping<String, Step> {
...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
Expand All @@ -30,19 +30,19 @@ local linters = new Mapping<String, Step> {
}
// 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"] = {
Expand Down Expand Up @@ -74,7 +74,6 @@ hooks {
}
["commit-msg"] {
steps = new Mapping<String, Step> {
["check-conventional-commit"] = Builtins.check_conventional_commit
["cocogitto_commit_msg"] = Builtins.cocogitto_commit_msg
}
}
Expand Down