Merge branch 'main' into marc-fix-pg-dump-args

Author: keegancsmith

.github/workflows/go-ci.yml

@@ -11,16 +11,15 @@ jobs:
   go-test:
     strategy:
       matrix:
-        go-version: [1.24.1]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
         with:
-          go-version: ${{ matrix.go-version }}
+          go-version-file: '.tool-versions'
       - name: (Windows) Enable pulling Go modules from private sourcegraph/sourcegraph
         if: runner.os == 'Windows'
         run: git config --global url."https://$env:PRIVATE_TOKEN@github.com/sourcegraph/".insteadOf "https://github.com/sourcegraph/"

.github/workflows/go-lint.yml

@@ -14,9 +14,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
         with:
-          go-version: 1.24.1
+          go-version-file: '.tool-versions'
       - name: Enable pulling Go modules from private sourcegraph/sourcegraph
         run: git config --global url."https://${PRIVATE_TOKEN}@github.com/sourcegraph/".insteadOf "https://github.com/sourcegraph/"
       - run: ./dev/go-lint.sh

.github/workflows/goreleaser-check.yml

@@ -17,9 +17,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
         with:
-          go-version: 1.24.1
+          go-version-file: '.tool-versions'
       - name: Enable pulling Go modules from private sourcegraph/sourcegraph
         run: git config --global url."https://${PRIVATE_TOKEN}@github.com/sourcegraph/".insteadOf "https://github.com/sourcegraph/"
       - name: Check GoReleaser config

.github/workflows/goreleaser.yml

@@ -179,9 +179,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
         with:
-          go-version: 1.24.1
+          go-version-file: '.tool-versions'
       - name: Enable pulling Go modules from private sourcegraph/sourcegraph
         run: git config --global url."https://${PRIVATE_TOKEN}@github.com/sourcegraph/".insteadOf "https://github.com/sourcegraph/"
       - run: go test ./...

.github/workflows/pr-auditor.yml

@@ -13,8 +13,8 @@ jobs:
         with:
           repository: 'sourcegraph/devx-service'
           token: ${{ secrets.PR_AUDITOR_TOKEN }}
-      - uses: actions/setup-go@v5
-        with: { go-version: '1.23' }
+      - uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
+        with: { go-version-file: '.tool-versions' }
 
       - run: 'go run ./cmd/pr-auditor'
         env:

.github/workflows/scip.yml

@@ -12,9 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@faf52423ec0d44c58f68e83b614bfcd99dded66f
         with:
-          go-version: 1.24.1
+          go-version-file: '.tool-versions'
 
       - name: Set directory to safe for git
         run: git config --global --add safe.directory $GITHUB_WORKSPACE

.golangci.yml

@@ -1,59 +1,73 @@
-# See explanation of linters at https://golangci-lint.run/usage/linters/
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
     - depguard
     - gocritic
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - nolintlint
     - staticcheck
-    - typecheck
     - unconvert
     - unused
-
-linters-settings:
-  depguard:
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: errors
+              desc: Use github.com/sourcegraph/sourcegraph/lib/errors instead
+            - pkg: github.com/pkg/errors
+              desc: Use github.com/sourcegraph/sourcegraph/lib/errors instead
+            - pkg: github.com/cockroachdb/errors
+              desc: Use github.com/sourcegraph/sourcegraph/lib/errors instead
+            - pkg: github.com/hashicorp/go-multierror
+              desc: Use github.com/sourcegraph/sourcegraph/lib/errors instead
+            - pkg: io/ioutil
+              desc: The ioutil package has been deprecated
+    forbidigo:
+      forbid:
+        - pattern: fmt\.Errorf
+    gocritic:
+      disabled-checks:
+        - appendAssign
+        - assignOp
+        - commentFormatting
+        - deprecatedComment
+        - exitAfterDefer
+        - ifElseChain
+        - singleCaseSwitch
+    govet:
+      disable:
+        - composites
+    staticcheck:
+      checks:
+        - all
+        - -QF1001 # De Morgan's law simplifications
+        - -QF1008 # Embedded field selector simplifications
+        - -ST1003 # Naming conventions (ID vs Id, URL vs Url, etc.)
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      main:
-        deny:
-          - pkg: "errors"
-            desc: "Use github.com/sourcegraph/sourcegraph/lib/errors instead"
-          - pkg: "github.com/pkg/errors"
-            desc: "Use github.com/sourcegraph/sourcegraph/lib/errors instead"
-          - pkg: "github.com/cockroachdb/errors"
-            desc: "Use github.com/sourcegraph/sourcegraph/lib/errors instead"
-          - pkg: "github.com/hashicorp/go-multierror"
-            desc: "Use github.com/sourcegraph/sourcegraph/lib/errors instead"
-          - pkg: "io/ioutil"
-            desc: "The ioutil package has been deprecated"
-  gocritic:
-    disabled-checks:
-      - appendAssign # Too many false positives
-      - assignOp # Maybe worth adding, but likely not worth the noise
-      - commentFormatting # No strong benefit
-      - deprecatedComment # Unnecessary
-      - exitAfterDefer # Only occurs in auxiliary tools
-      - ifElseChain # Noisy for not much gain
-      - singleCaseSwitch # Noisy for not much gain
-  govet:
-    disable:
-      - composites
-  forbidigo:
-    forbid:
-      # Use errors.New instead
-      - 'fmt\.Errorf'
-
-issues:
-  exclude-rules:
-    # Exclude bodyclose lint from tests because leaking connections in tests
-    # is a non-issue, and checking that adds unnecessary noise
-    - path: _test\.go
-      linters:
-        - bodyclose
-
-run:
-  timeout: 5m
+      - linters:
+          - bodyclose
+        path: _test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.tool-versions

@@ -1,3 +1,3 @@
-golang     1.24.1
+golang     1.25.4
 shfmt      3.8.0
 shellcheck 0.10.0

Dockerfile

@@ -4,14 +4,14 @@
 #
 # Nothing fancy here: we copy in the source code and build on the Alpine Go
 # image. Refer to .dockerignore to get a sense of what we're not going to copy.
-FROM golang:1.24.1-alpine@sha256:43c094ad24b6ac0546c62193baeb3e6e49ce14d3250845d166c77c25f64b0386 AS builder
+FROM golang:1.25.4-alpine3.22@sha256:d3f0cf7723f3429e3f9ed846243970b20a2de7bae6a5b66fc5914e228d831bbb AS builder
 
 COPY . /src
 WORKDIR /src
 RUN go build ./cmd/src
 
 # This stage should be kept in sync with Dockerfile.release.
-FROM alpine:3.22@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
+FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412
 
 # needed for `src code-intel upload` and `src actions exec`
 RUN apk add --no-cache git

cmd/src/batch_common.go

@@ -632,7 +632,7 @@ func getBatchSpecDirectory(file string) (string, error) {
 func checkExecutable(cmd string, args ...string) error {
 	if err := exec.Command(cmd, args...).Run(); err != nil {
 		return fmt.Errorf(
-			"failed to execute \"%s %s\":\n\t%s\n\n'src batch' requires %q to be available.",
+			"failed to execute \"%s %s\":\n\t%s\n\n'src batch' requires %q to be available",
 			cmd,
 			strings.Join(args, " "),
 			err,