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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions: {}

env:
ACTIONLINT_VERSION: "v1.7.9"
GOLANGCI_LINT_VERSION: "v2.13.0"
GOLANGCI_LINT_VERSION: "v2.15.0"
JUST_VERSION: "1.53.0"
LIBPATHRS_VERSION: "0.2.5"
ZIZMOR_VERSION: "1.26.1"
Expand Down
4 changes: 3 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ formatters:
- goimports
settings:
gofumpt:
extra-rules: true
extra:
group-params: true
clothe-returns: true
goimports:
local-prefixes:
- go.amutable.dev/quarry
6 changes: 4 additions & 2 deletions internal/generics/iter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ func TestErrorIter_EarlyTermination(t *testing.T) {
return nil
})

for range seq {
for _, err := range seq {
require.NoError(t, err)
break
}
assert.Equal(t, 1, produced, "producer should stop after consumer breaks")
Expand Down Expand Up @@ -378,7 +379,8 @@ func TestSeqRight_EarlyTermination(t *testing.T) {
), &yielded)

var count int
for range generics.SeqRight(src) {
for err := range generics.SeqRight(src) {
require.NoError(t, err)
count++
if count == 3 {
break
Expand Down
8 changes: 6 additions & 2 deletions internal/hostnamed/hostnamedtest/real.go
Original file line number Diff line number Diff line change
Expand Up @@ -333,11 +333,15 @@ func (h *Hostnamed) Stop(t *testing.T) {
return
}
_ = h.cmd.Process.Signal(syscall.SIGTERM)
var err error
select {
case <-h.waitCh:
case err = <-h.waitCh:
case <-time.After(10 * time.Second):
_ = h.cmd.Process.Kill()
<-h.waitCh
err = <-h.waitCh
}
if err != nil {
t.Logf("systemd-hostnamed exited uncleanly: %v", err)
}
h.cmd = nil
}
Expand Down
Loading