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
5 changes: 2 additions & 3 deletions .github/workflows/TestAndBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.24'
go-version: '1.25'
- name: Lint
uses: golangci/golangci-lint-action@v5
uses: golangci/golangci-lint-action@v8
with:
version: latest
args: --timeout=5m

- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Thank you for your interest in contributing to Zanadir! This document provides g

## Prerequisites

- Go 1.24 or later
- Go 1.25 or later
- Git
- Basic understanding of Go programming language

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1 - Build binary and get CA certs
FROM golang:1.24-alpine AS builder
FROM golang:1.25-alpine AS builder

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ lint:

# Install golangci-lint if not present
install-lint:
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.59.0
6 changes: 3 additions & 3 deletions config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ func TestCreateConfig(t *testing.T) {

if tt.dir == "/tmp/symlinkdir" {
_ = os.Symlink("/tmp/testdir", "/tmp/symlinkdir")
defer os.Remove("/tmp/symlinkdir")
defer os.Remove("/tmp/symlinkdir") //nolint:errcheck
} else if tt.dir != "" {
_ = os.MkdirAll(tt.dir, os.ModePerm)
defer os.RemoveAll(tt.dir)
defer os.RemoveAll(tt.dir) //nolint:errcheck
}

config, err := CreateConfig(cmd)
Expand All @@ -76,7 +76,7 @@ func TestCreateConfig(t *testing.T) {
cmd.Flags().String("dir", "/tmp/testdir", "directory")
cmd.Flags().StringSlice("excluded-categories", []string{}, "excluded categories")
_ = os.MkdirAll("/tmp/testdir", os.ModePerm)
defer os.RemoveAll("/tmp/testdir")
defer os.RemoveAll("/tmp/testdir") //nolint:errcheck
config, err := CreateConfig(cmd)
assert.Error(t, err)
assert.Nil(t, config)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/MustacheCase/zanadir

go 1.24.6
go 1.25

require (
github.com/olekukonko/tablewriter v0.0.5
Expand Down
2 changes: 1 addition & 1 deletion handler/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func captureOutput(f func()) string {

f()

w.Close()
w.Close() //nolint:errcheck
var buf bytes.Buffer
_, _ = io.Copy(&buf, r)
os.Stdout = old
Expand Down
8 changes: 4 additions & 4 deletions utils/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ extra:
`
tmpFile, err := os.CreateTemp("", "test-*.yaml")
assert.NoError(t, err)
defer os.Remove(tmpFile.Name()) // Clean up the file after the test
defer os.Remove(tmpFile.Name()) //nolint:errcheck // Clean up the file after the test

_, err = tmpFile.WriteString(yamlContent)
assert.NoError(t, err)
tmpFile.Close()
tmpFile.Close() //nolint:errcheck

// Define the target structure
var result testStruct
Expand Down Expand Up @@ -62,11 +62,11 @@ age: thirty # Invalid value for an integer field
`
tmpFile, err := os.CreateTemp("", "test-invalid-*.yaml")
assert.NoError(t, err)
defer os.Remove(tmpFile.Name()) // Clean up the file after the test
defer os.Remove(tmpFile.Name()) //nolint:errcheck // Clean up the file after the test

_, err = tmpFile.WriteString(invalidYAMLContent)
assert.NoError(t, err)
tmpFile.Close()
tmpFile.Close() //nolint:errcheck

// Define the target structure
var result testStruct
Expand Down