From 856344fce0c5dcaf7f9dad790d42374ff8db469a Mon Sep 17 00:00:00 2001 From: Javier Marcos <1271349+javuto@users.noreply.github.com> Date: Sat, 6 Jun 2026 15:17:17 +0200 Subject: [PATCH 1/3] Bump golang to 1.26.3 --- .github/workflows/ci-develop.yml | 4 ++-- .github/workflows/ci-main.yml | 4 ++-- .github/workflows/release.yml | 2 +- go.mod | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-develop.yml b/.github/workflows/ci-develop.yml index 637bad7..9b95318 100644 --- a/.github/workflows/ci-develop.yml +++ b/.github/workflows/ci-develop.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ">=1.24.3" + go-version: ">=1.26.3" cache: true - name: Run golangci-lint @@ -47,7 +47,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ">=1.24.3" + go-version: ">=1.26.3" cache: true - name: Run GoReleaser snapshot diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 637a320..b531be8 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ">=1.24.3" + go-version: ">=1.26.3" cache: true - name: Run golangci-lint @@ -47,7 +47,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ">=1.24.3" + go-version: ">=1.26.3" cache: true - name: Run GoReleaser snapshot diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 315c1f7..f89af3d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: ">=1.24.3" + go-version: ">=1.26.3" cache: true - name: Run GoReleaser diff --git a/go.mod b/go.mod index 3e3fb97..f9ec440 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/jmpsec/osctrld -go 1.24.3 +go 1.26.3 require ( github.com/rs/zerolog v1.35.1 From 5cd8f7aca8287093da6d3ff303db6d5b91a5242a Mon Sep 17 00:00:00 2001 From: Javier Marcos <1271349+javuto@users.noreply.github.com> Date: Sat, 6 Jun 2026 15:53:51 +0200 Subject: [PATCH 2/3] Update golangci-lint to version with golang 1.26.3 --- .github/workflows/ci-develop.yml | 4 ++-- .github/workflows/ci-main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-develop.yml b/.github/workflows/ci-develop.yml index 9b95318..cd3fbc6 100644 --- a/.github/workflows/ci-develop.yml +++ b/.github/workflows/ci-develop.yml @@ -25,9 +25,9 @@ jobs: cache: true - name: Run golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 with: - version: latest + version: v2.12.2 - name: Run tests run: go test ./cmd/osctrld/ -race -coverprofile=coverage.out -v diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index b531be8..7fd5a28 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -25,9 +25,9 @@ jobs: cache: true - name: Run golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 with: - version: latest + version: v2.12.2 - name: Run tests run: go test ./cmd/osctrld/ -race -coverprofile=coverage.out -v From f955d2cd7c849f43d328526ffdade81bc31f7a41 Mon Sep 17 00:00:00 2001 From: Javier Marcos <1271349+javuto@users.noreply.github.com> Date: Sat, 6 Jun 2026 16:03:47 +0200 Subject: [PATCH 3/3] Updated golangci-lint configuration to v2 --- .golangci.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 710898b..059dfd6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,16 +1,18 @@ +version: "2" + linters: enable: - govet - errcheck - staticcheck - unused - - gosimple - ineffassign - - typecheck - -linters-settings: - errcheck: - check-type-assertions: true - -issues: - exclude-use-default: true + settings: + errcheck: + check-type-assertions: true + exclusions: + presets: + - comments + - common-false-positives + - legacy + - std-error-handling