Merge pull request #162 from grafana/dependabot/github_actions/golangci/golangci-lint-action-7

build(deps): bump golangci/golangci-lint-action from 6 to 7

Author: szkiba

.devcontainer/devcontainer.json

@@ -24,7 +24,7 @@
     "ghcr.io/devcontainers/features/docker-in-docker:2": {},
     "ghcr.io/devcontainers/features/go:1": {
       "version": "1.23",
-      "golangciLintVersion": "1.63.4"
+      "golangciLintVersion": "2.0.2"
     },
     "ghcr.io/guiyomh/features/goreleaser:0": { "version": "2.6.1" },
     "ghcr.io/guiyomh/features/gotestsum:0": { "version": "1.12.1" },

.github/workflows/tooling-validate.yml

@@ -123,14 +123,14 @@ jobs:
 
       - name: Run minimal golangci-lint ${{ inputs.golangci-lint-version }}
         if: ${{ hashFiles('.golangci.yml','.golangci.yaml','.golangci.toml','.golangci.json') == ''}}
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: "${{ inputs.golangci-lint-version }}"
           args: --timeout=30m --no-config --presets bugs --enable gofmt
 
       - name: Run configured golangci-lint ${{ inputs.golangci-lint-version }}
         if: ${{ hashFiles('.golangci.yml','.golangci.yaml','.golangci.toml','.golangci.json') != ''}}
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: "${{ inputs.golangci-lint-version }}"
           only-new-issues: true

.golangci.yml

@@ -1,39 +1,40 @@
-issues:
-  max-issues-per-linter: 0
-  max-same-issues: 0
-  exclude-use-default: false
-  exclude-dirs:
-    # adopted from fixuid source: https://github.com/boxboat/fixuid
-    - internal/fixids
-
+version: "2"
 linters:
-  enable-all: true
+  default: all
   disable:
-    # Except for general-purpose public APIs,
-    # wrapping errors is more inconvenient and error prone than useful.
-    - wrapcheck
-
-    # Many go standard library API functions have typical parameter names shorter than 3 characters.
-    # It is better to use the usual parameter names than to create one that conforms to the rule.
-    - varnamelen
-
     # In many cases (e.g. options) it is normal usage not to specify all structure fields.
     - exhaustruct
 
-    # The linter 'exportloopref' is deprecated (since v1.60.2) due to:
-    # Since Go1.22 (loopvar) this linter is no longer relevant.
-    # Replaced by copyloopvar.
-    - exportloopref
-
     # TODO Temporary: Builder struct json field names do not comply with this rule,
     # but this struct will be refactored soon.
     - tagliatelle
 
-linters-settings:
-  depguard:
-    rules:
-      prevent_accidental_imports:
-        allow:
-          - $gostd
-          - github.com/stretchr/testify/require
-          - github.com/grafana/k6foundry
+    # Many go standard library API functions have typical parameter names shorter than 3 characters.
+    # It is better to use the usual parameter names than to create one that conforms to the rule.
+    - varnamelen
+
+    # Except for general-purpose public APIs,
+    # wrapping errors is more inconvenient and error prone than useful.
+    - wrapcheck
+  settings:
+    depguard:
+      rules:
+        prevent_accidental_imports:
+          allow:
+            - $gostd
+            - github.com/stretchr/testify/require
+            - github.com/grafana/k6foundry
+            - go.k6.io/xk6
+  exclusions:
+    paths:
+      # adopted from fixuid source: https://github.com/boxboat/fixuid
+      - internal/fixids
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports

internal/legacy/builder.go

@@ -91,13 +91,13 @@ func (b Builder) newBuilderEnv(log *slog.Logger) map[string]string {
 	raceArg := "-race"
 
 	// trim debug symbols by default
-	if (b.RaceDetector || strings.Contains(b.BuildFlags, raceArg)) && !b.Compile.Cgo {
+	if (b.RaceDetector || strings.Contains(b.BuildFlags, raceArg)) && !b.Cgo {
 		log.Warn("Enabling cgo because it is required by the race detector")
 
-		b.Compile.Cgo = true
+		b.Cgo = true
 	}
 
-	env["CGO_ENABLED"] = b.Compile.CgoEnabled()
+	env["CGO_ENABLED"] = b.CgoEnabled()
 
 	return env
 }

releases/v0.16.0.md

@@ -4,6 +4,7 @@ This release includes:
 - Public xk6 Builder API removed
 - New golangci-lint configuration
 - New Dependabot configuration
+- golangci-lint updated to v2.0.2
 
 ## Breaking changes
 
@@ -31,3 +32,7 @@ Dependabot has been configured to keep the following dependencies up to date:
 - Docker base images
 - Dev Container features
 - GitHub Actions
+
+### golangci-lint updated to v2.0.2
+
+Using [Development Containers](https://containers.dev/) allows for easy updating of the [golangci-lint](https://github.com/golangci/golangci-lint) version. The pull request opened by Dependabot had to be modified a bit because changing the golangci-lint major version means a completely different configuration file format. From now on, xk6 uses `golangci-lint v2.0.2`.