github/golangci-lint: Failing on Go 1.23

hashicorp · Aug 27, 2024 · 57d4304 · 57d4304
1 parent 09732bf
commit 57d4304
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/.ci/.golangci2.yml b/.ci/.golangci2.yml
@@ -38,16 +38,16 @@ linters-settings:
     # "ignore" is deprecated but "exclude-functions" doesn't seem to work or the syntax is non-obvious.
     # https://github.com/kisielk/errcheck#excluding-functions
     # Under exclude-functions are the various attempts at getting it to work, all of which result in d.Set being linted everywhere.
-    #exclude-functions:
-    #  - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.(*ResourceData).Set
-    #  - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData.Set
-    #  - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew|Set,io:Close
-    #  - (github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData).Set
-    #  - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew|Set
-    #  - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew
-    #  - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:Set
-    #  - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.Set
-    #  - io:Close
+    # exclude-functions:
+    #   - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.(*ResourceData).Set
+    #   - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData.Set
+    #   - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew|Set,io:Close
+    #   - (github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.ResourceData).Set
+    #   - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew|Set
+    #   - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:ForceNew
+    #   - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema:Set
+    #   - github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema.Set
+    #   - io:Close
   errorlint:
     errorf: false
   goconst:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -41,7 +41,7 @@ jobs:
             awk '{print $2}'
           )" >> $GITHUB_OUTPUT
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v3.7.1
+        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
           version: "${{ steps.golangci-lint-version.outputs.version }}"
           args: --config .ci/.golangci.yml
@@ -64,15 +64,15 @@ jobs:
             awk '{print $2}'
           )" >> $GITHUB_OUTPUT
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v3.7.1
+        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
           version: "${{ steps.golangci-lint-version.outputs.version }}"
           args: --config .ci/.golangci2.yml
         env:
           # Trigger garbage collection more frequently to reduce the likelihood
           # of OOM errors.
           # ref: https://golangci-lint.run/usage/performance/#memory-usage
-          GOGC: "50"
+          GOGC: "30"
   golangci-lintc:
     name: 3 of 3
     needs: [golangci-linta]
@@ -92,12 +92,12 @@ jobs:
             awk '{print $2}'
           )" >> $GITHUB_OUTPUT
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v3.7.1
+        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
           version: "${{ steps.golangci-lint-version.outputs.version }}"
           args: --config .ci/.golangci3.yml
         env:
           # Trigger garbage collection more frequently to reduce the likelihood
           # of OOM errors.
           # ref: https://golangci-lint.run/usage/performance/#memory-usage
-          GOGC: "50"
+          GOGC: "30"