From 099457a19cec0c2e3b8ed7d2f28d42dd7d4f4ae7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 26 May 2025 05:49:46 +0200
Subject: [PATCH] Merging upstream version 1.0.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
---
 .forgejo/workflows/test.yml |  8 ++++----
 .golangci.yaml              | 34 ++++++++++++++++++++++++----------
 go.mod                      |  8 +++++---
 go.sum                      |  8 ++++----
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml
index 696628c..63ce27f 100644
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@@ -7,9 +7,9 @@ on:
 
 jobs:
   test:
-    runs-on: docker-bookworm
+    runs-on: docker-global-bookworm
     container:
-      image: 'code.forgejo.org/oci/node:20-bookworm'
+      image: 'code.forgejo.org/oci/node:22-bookworm'
     services:
       memcached:
         image: memcached:1.6-alpine
@@ -19,8 +19,8 @@ jobs:
         with:
           go-version-file: "go.mod"
       - name: golangci-lint
-        uses: https://github.com/golangci/golangci-lint-action@v6
+        uses: https://github.com/golangci/golangci-lint-action@v8
         with:
-          version: v1.60.3 # renovate: datasource=go depName=golangci-lint packageName=github.com/golangci/golangci-lint/cmd/golangci-lint
+          version: v2.1.6 # renovate: datasource=go depName=golangci-lint packageName=github.com/golangci/golangci-lint/cmd/golangci-lint
       - name: test
         run: MEMCACHE_CONN=memcached:11211 go test -v ./...
diff --git a/.golangci.yaml b/.golangci.yaml
index 25287ce..558581f 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,27 +1,41 @@
+version: "2"
 linters:
-  enable-all: false
-  disable-all: true
-  fast: false
+  default: none
   enable:
     - bidichk
     - dupl
     - errcheck
     - forbidigo
     - gocritic
-    - gofmt
-    - gofumpt
-    - gosimple
     - govet
     - ineffassign
     - nakedret
     - nolintlint
     - revive
     - staticcheck
-    - stylecheck
-    - tenv
     - testifylint
-    - typecheck
     - unconvert
-    - unused
     - unparam
+    - unused
     - wastedassign
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/go.mod b/go.mod
index 95bd4fb..9701b37 100644
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,12 @@
 module code.forgejo.org/go-chi/cache
 
-go 1.23
+go 1.24
+
+toolchain go1.24.3
 
 require (
-	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874
-	github.com/stretchr/testify v1.9.0
+	github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf
+	github.com/stretchr/testify v1.10.0
 )
 
 require (
diff --git a/go.sum b/go.sum
index 65fe46b..bb3fa66 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,11 @@
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf h1:TqhNAT4zKbTdLa62d2HDBFdvgSbIGB3eJE8HqhgiL9I=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=