ci: include lint in same matrix

Make sure we lint on all Go versions to prevent fixing linting issues
that don't apply to old versions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

.github/workflows/test.yml

@@ -20,7 +20,7 @@ on:
 jobs:
 
   linux:
-    name: Test ${{ matrix.platform }} (${{ matrix.go || 'oldest' }})
+    name: ${{ matrix.platform }} (${{ matrix.go || 'oldest' }})
     timeout-minutes: 10
     strategy:
       fail-fast: false
@@ -41,13 +41,17 @@ jobs:
       with:
         go-version: ${{ matrix.go }}
         go-version-file: "go.mod" # used when go-version is not specified.
+    - name: Lint
+      uses: golangci/golangci-lint-action@v9
+      with:
+        args: --timeout=5m
     - name: Build for ${{ matrix.platform }}
       run: go build ./...
     - name: Test
       run: go test -exec sudo -v ./...
 
   other:
-    name: Test ${{ matrix.platform }} (${{ matrix.go || 'oldest' }})
+    name: ${{ matrix.platform }} (${{ matrix.go || 'oldest' }})
     timeout-minutes: 10
     strategy:
       fail-fast: false
@@ -66,26 +70,11 @@ jobs:
         with:
           go-version: ${{ matrix.go }}
           go-version-file: "go.mod" # used when go-version is not specified.
+      - name: Lint
+        uses: golangci/golangci-lint-action@v9
+        with:
+          args: --timeout=5m
       - name: Build for ${{ matrix.platform }}
         run: go build ./...
       - name: Test
         run: go test -v ./...
-
-  lint:
-    name: Lint ${{ matrix.platform }}
-    timeout-minutes: 10
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ubuntu-24.04, windows-latest, macos-latest]
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version: "stable"
-          cache: false
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v9
-        with:
-          args: --timeout=5m