From 0167f99132fba4b3773fac72075606757d1041dd Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Sun, 12 Oct 2025 21:22:51 +0200 Subject: [PATCH 1/5] Update Go and dependencies --- go.mod | 8 ++++---- go.sum | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d333d96..d82036a 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/xperimental/linky -go 1.24 +go 1.24.0 -toolchain go1.24.0 +toolchain go1.25.2 require ( - github.com/spf13/pflag v1.0.6 - golang.org/x/net v0.35.0 + github.com/spf13/pflag v1.0.10 + golang.org/x/net v0.46.0 ) diff --git a/go.sum b/go.sum index f67cc61..2fbde18 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,8 @@ github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= From 97c345602ce07d860b8ceb52ff3de352a6271b70 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Sun, 12 Oct 2025 21:25:02 +0200 Subject: [PATCH 2/5] Update Go in workflow and Dockerfile --- .github/workflows/golang.yaml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/golang.yaml b/.github/workflows/golang.yaml index 606dc6b..d017a9d 100644 --- a/.github/workflows/golang.yaml +++ b/.github/workflows/golang.yaml @@ -12,7 +12,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: 1.25.2 - name: Test run: make test lint: @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: 1.25.2 - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/Dockerfile b/Dockerfile index 6754439..5f1e577 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.0 AS builder +FROM golang:1.25.2 AS builder WORKDIR /build From 0217ca2cfdb1abdb1ce2262f6d4040b7a8018f0a Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Sun, 12 Oct 2025 21:27:03 +0200 Subject: [PATCH 3/5] Update golangci-lint --- .github/workflows/golang.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/golang.yaml b/.github/workflows/golang.yaml index d017a9d..fdc7d92 100644 --- a/.github/workflows/golang.yaml +++ b/.github/workflows/golang.yaml @@ -23,6 +23,6 @@ jobs: with: go-version: 1.25.2 - name: golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v8 with: - version: v1.64.5 + version: v2.5.0 From 565f49615d3271f786bbe73133d4b16a3dbf2d19 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Sun, 12 Oct 2025 21:30:55 +0200 Subject: [PATCH 4/5] Update code for new golangci-lint --- supervisor.go | 6 +----- worker.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/supervisor.go b/supervisor.go index 853e028..dc09f91 100644 --- a/supervisor.go +++ b/supervisor.go @@ -71,11 +71,7 @@ func (s *supervisor) Results() []update { } func (s *supervisor) loop() { - for { - if len(s.queue) == 0 { - break - } - + for len(s.queue) != 0 { next := s.queue[0] s.queue = s.queue[1:] diff --git a/worker.go b/worker.go index e42a092..5d247e1 100644 --- a/worker.go +++ b/worker.go @@ -64,7 +64,7 @@ func (w *worker) fetchURL(location location) (result update) { result.Error = err return } - defer res.Body.Close() + defer res.Body.Close() //nolint:errcheck result.Status = res.StatusCode From 54bd73250c3b67fec19e76a74c3465fe72beffe3 Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Sun, 12 Oct 2025 21:32:51 +0200 Subject: [PATCH 5/5] Update Github actions --- .github/workflows/docker.yaml | 2 +- .github/workflows/golang.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index d62e454..da0279b 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 - name: Docker Metadata diff --git a/.github/workflows/golang.yaml b/.github/workflows/golang.yaml index fdc7d92..a45489c 100644 --- a/.github/workflows/golang.yaml +++ b/.github/workflows/golang.yaml @@ -8,7 +8,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up Go uses: actions/setup-go@v5 with: @@ -18,7 +18,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: actions/setup-go@v5 with: go-version: 1.25.2