chore: update Go version and configure golangci-lint v2

- Update `.golangci.yml` to use the v2 configuration format for linters and exclusions.
- Explicitly define enabled linters and formatters, moving `gofmt` and `goimports` to the `formatters.enable` section.
- Remove `gosimple` and `stylecheck` from the enabled linters.
- Update the GitHub Actions workflow to specify `version: v2` for `golangci-lint-action` to match the project configuration.
- Update `go.mod` to use `go 1.24.0` and update the toolchain to `go1.24.3`.
- Update `CONTRIBUTING.md` to reflect that `golangci-lint` is managed as a project dependency via Go's tool system.
- Modify `Makefile` to use `go tool golangci-lint run` for linting.
- Adjust logging calls in `commands/build.go`, `commands/logging.go`, `commands/render.go`, `commands/run.go`, and `commands/serve.go` by removing `//nolint:govet` and ensuring correct formatting.
- Update `filters/filters_test.go` to remove `rand.Seed(1)` and move the sample filter test to a dedicated function.
- Update dependencies in `go.mod` and `go.sum` to newer versions.
- Modify `renderers/markdown_toc.go` to use a `switch` statement for tag types, improving clarity.
- Modify `server/watcher.go` and `site/rebuild.go` to use `%s` for error logging, replacing `err.Error()`.

Author: osteele

.github/workflows/golangci-lint.yml

@@ -22,10 +22,9 @@ jobs:
           # Cache disabled because golangci-lint-action has its own caching
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          # Use latest to automatically get versions built with newer Go
-          version: latest
+          version: v2.6.2
           # On PRs, only check new issues introduced by the PR
           only-new-issues: ${{ github.event_name == 'pull_request' }}
           args: --timeout=30m

.golangci.yml

@@ -1,3 +1,5 @@
+version: "2"
+
 run:
   timeout: 30m
   tests: true
@@ -7,18 +9,13 @@ linters:
   enable:
     # Enabled by default
     - errcheck      # Check for unchecked errors
-    - gosimple      # Simplify code
     - govet         # Reports suspicious constructs
     - ineffassign   # Detect ineffectual assignments
     - staticcheck   # Static analysis
     - unused        # Check for unused code
 
     # Additional recommended linters
-    - gofmt         # Check whether code was gofmt-ed
-    - goimports     # Check import statements are formatted
     - misspell      # Find commonly misspelled English words
-    - revive        # Fast, configurable, extensible linter
-    - stylecheck    # Replacement for golint
     - unconvert     # Remove unnecessary type conversions
     - gocyclo       # Check cyclomatic complexity
     - gocritic      # Comprehensive Go linter
@@ -27,34 +24,42 @@ linters:
     - depguard      # Can be too restrictive for general use
     - unparam       # Too many false positives for functions keeping params for consistency
 
-linters-settings:
-  gocyclo:
-    # Maximum cyclomatic complexity of a function
-    min-complexity: 15
+  exclusions:
+    rules:
+      # Common false positives - fmt print functions and deferred cleanup don't need error checking
+      - text: "Error return value of .((os\\.RemoveAll|fmt\\.(Fprint|Fprintf|Fprintln)|.*\\.Close|.*\\.Write|.*\\.Flush)). is not checked"
+        linters: [errcheck]
 
-  misspell:
-    locale: US
+      # Exclude some linters from running on tests files
+      - path: _test\.go
+        linters:
+          - gocyclo
+          - errcheck
+          - dupl
+          - gosec
 
-  revive:
-    # Minimal config - can be expanded based on project needs
-    rules:
-      - name: exported
-        disabled: false
-      - name: package-comments
-        disabled: true  # Not all packages need comments
+  settings:
+    gocyclo:
+      min-complexity: 15
+
+    misspell:
+      locale: US
+
+    revive:
+      rules:
+        - name: exported
+          disabled: false
+        - name: package-comments
+          disabled: true
+
+formatters:
+  enable:
+    - gofmt         # Check whether code was gofmt-ed
+    - goimports     # Check import statements are formatted
 
 issues:
   # Maximum issues count per linter
   max-issues-per-linter: 0
 
   # Maximum count of issues with the same text
   max-same-issues: 0
-
-  # Exclude some linters from running on tests files
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - gocyclo
-        - errcheck
-        - dupl
-        - gosec

CONTRIBUTING.md

@@ -27,8 +27,7 @@ make setup
 go get -t ./...
 ```
 
-[Install golangci-lint](https://golangci-lint.run/usage/install/#local-installation).
-On macOS: `brew install golangci-lint`
+golangci-lint is managed as a project dependency via Go's tool system. It will be automatically available after running `go get -t ./...`
 
 Install the Dart Sass executable (required for tests):
 - On macOS: `brew install sass/sass/sass`

Makefile

@@ -42,7 +42,7 @@ install:
 	go install ${LDFLAGS} ${PACKAGE}
 
 lint:
-	golangci-lint run
+	go tool golangci-lint run
 
 test:
 	go test ./...

commands/build.go

@@ -26,7 +26,7 @@ func buildCommand(site *site.Site) error {
 		elapsed := time.Since(commandStartTime)
 		bannerLog.label("", "wrote %d files in %.2fs.", count, elapsed.Seconds())
 	case watch:
-		log.Error(err.Error())
+		log.Error("%s", err.Error())
 	default:
 		return err
 	}

commands/logging.go

@@ -23,6 +23,5 @@ func (l *bannerLogger) label(label string, msg string, a ...interface{}) {
 }
 
 func (l *bannerLogger) path(label string, filename string) {
-	//nolint:govet
-	l.label(label, utils.MustAbs(filename))
+	l.label(label, "%s", utils.MustAbs(filename))
 }

commands/render.go

@@ -16,8 +16,7 @@ func renderCommand(site *site.Site) error {
 		return err
 	}
 	bannerLog.path("Render:", filepath.Join(site.SourceDir(), p.Source()))
-	//nolint:govet
-	bannerLog.label("URL:", p.URL())
+	bannerLog.label("URL:", "%s", p.URL())
 	bannerLog.label("Content:", "")
 	return site.WriteDocument(os.Stdout, p)
 }

commands/run.go

@@ -54,8 +54,7 @@ func run(cmd string) error { // nolint: gocyclo
 	// labels will line up. And print it even if
 	// loading the site produced an error.
 	if *versionFlag {
-		//nolint:govet
-		bannerLog.label("Version:", version.Version)
+		bannerLog.label("Version:", "%s", version.Version)
 	}
 	if err != nil {
 		return err

commands/serve.go

@@ -15,7 +15,6 @@ var (
 func serveCommand(site *site.Site) error {
 	server := server.Server{Site: site}
 	return server.Run(*open, func(label, value string) {
-		//nolint:govet
-		bannerLog.label(label, value)
+		bannerLog.label(label, "%s", value)
 	})
 }

filters/filters_test.go

@@ -2,7 +2,6 @@ package filters
 
 import (
 	"fmt"
-	"math/rand"
 	"strings"
 	"testing"
 	"time"
@@ -22,7 +21,6 @@ var filterTests = []struct{ in, expected string }{
 
 	// arrays
 	{`{{ array | array_to_sentence_string }}`, "first, second, and third"},
-	{`{{ array | sample }}`, "third"},
 
 	{`{{ site.members | group_by: "graduation_year" | map: "name" | sort | join }}`, "2013 2014 2015"},
 	{`{{ site.members | group_by_exp: "item", "item.graduation_year" | size }}`, "4"},
@@ -107,15 +105,27 @@ var filterTestBindings = liquid.Bindings{
 }
 
 func TestFilters(t *testing.T) {
-	//nolint:staticcheck // Ignore this for now
-	rand.Seed(1)
 	for i, test := range filterTests {
 		t.Run(fmt.Sprintf("%02d", i+1), func(t *testing.T) {
 			requireTemplateRender(t, test.in, filterTestBindings, test.expected)
 		})
 	}
 }
 
+func TestSampleFilter(t *testing.T) {
+	engine := liquid.NewEngine()
+	cfg := config.Default()
+	AddJekyllFilters(engine, &cfg)
+
+	// Test that sample returns one of the array elements
+	data, err := engine.ParseAndRender([]byte(`{{ array | sample }}`), filterTestBindings)
+	require.NoError(t, err)
+	result := strings.TrimSpace(string(data))
+
+	validResults := []string{"first", "second", "third"}
+	require.Contains(t, validResults, result, "sample should return one of the array elements")
+}
+
 // func TestXMLEscapeFilter(t *testing.T) {
 // 	data := map[string]interface{}{
 // 		"obj": map[string]interface{}{