Merge branch 'main' into tests/cel-clientsettingspolicies

shaun-nx · web-flow · commit 69f485b74cd3 · 2025-07-23T18:10:45.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -163,7 +163,7 @@ jobs:
 
       - name: Scan SBOM
         id: scan
-        uses: anchore/scan-action@16910ac423301c6d30554b83a7f71ac6ff4a51f3 # v6.4.0
+        uses: anchore/scan-action@df395807f4554463d4455b8047cf58e37b6acaae # v6.5.0
         with:
           sbom: "sbom-${{ inputs.image }}.json"
           only-fixed: true
diff --git a/internal/framework/types/types.go b/internal/framework/types/types.go
@@ -1,4 +1,4 @@
-package types //nolint:revive // ignoring meaningless package name
+package types //nolint:revive, nolintlint // ignoring “meaningless package name” and the unused-nolint warning
 
 import "sigs.k8s.io/controller-runtime/pkg/client"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package types //nolint:revive // ignoring meaningless package name`
	`1`	`+package types //nolint:revive, nolintlint // ignoring “meaningless package name” and the unused-nolint warning`
`2`	`2`
`3`	`3`	`import "sigs.k8s.io/controller-runtime/pkg/client"`
`4`	`4`