Skip to content

Commit 9fa1dca

Browse files
authored
Merge pull request #31 from snorwin/dependabot/github_actions/golangci/golangci-lint-action-8
Bump golangci/golangci-lint-action from 6 to 8
2 parents 73be421 + 4130d9a commit 9fa1dca

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: golangci-lint
16-
uses: golangci/golangci-lint-action@v6
16+
uses: golangci/golangci-lint-action@v8
1717
with:
1818
version: latest

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17.8-alpine3.15 as builder
1+
FROM golang:1.24.1-alpine3.21 as builder
22
ARG VERSION
33
ARG HASH
44

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/snorwin/haproxy-reload-wrapper
22

3-
go 1.21
3+
go 1.24.1
44

55
require github.com/fsnotify/fsnotify v1.9.0
66

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func main() {
6666
select {
6767
case event := <-fswatch.Events:
6868
// only care about events which may modify the contents of the directory
69-
if !(event.Has(fsnotify.Write) || event.Has(fsnotify.Remove) || event.Has(fsnotify.Create)) {
69+
if !event.Has(fsnotify.Write) && !event.Has(fsnotify.Remove) && !event.Has(fsnotify.Create) {
7070
continue
7171
}
7272

pkg/exec/async.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ func Command(name string, arg ...string) *Cmd {
1616
}
1717

1818
func (a *Cmd) AsyncRun() error {
19-
if err := a.Cmd.Start(); err != nil {
19+
if err := a.Start(); err != nil {
2020
a.Error = err
2121
return a.Error
2222
}
23-
if a.Cmd.Process == nil || a.Cmd.Process.Pid < 1 {
23+
if a.Process == nil || a.Process.Pid < 1 {
2424
a.Error = errors.New("unable to create process")
2525
return a.Error
2626
}
2727

2828
go func() {
29-
a.Error = a.Cmd.Wait()
29+
a.Error = a.Wait()
3030
a.Terminated <- true
3131
}()
3232

3333
return nil
3434
}
3535

3636
func (a *Cmd) Status() string {
37-
if a.Cmd.Process == nil {
37+
if a.Process == nil {
3838
return "not started"
3939
}
4040

41-
if a.Cmd.ProcessState != nil {
42-
return a.Cmd.ProcessState.String()
41+
if a.ProcessState != nil {
42+
return a.ProcessState.String()
4343
}
4444

4545
if a.Error != nil {

0 commit comments

Comments
 (0)