Merge remote-tracking branch 'origin/main' into HEAD

.github/mergify.yml

@@ -1,24 +1,23 @@
 queue_rules:
   - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
-      - check-success=lint
-      - check-success=test
-
-pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
+    queue_conditions:
       - base=master
       - "#approved-reviews-by>=1"
       - "#changes-requested-reviews-by=0"
       - check-success=lint
       - check-success=test
       - label!=do-not-merge
       - label=ready-to-merge
+    merge_conditions:
+      # Conditions to get out of the queue (= merged)
+      - check-success=lint
+      - check-success=test
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+    merge_method: merge
+
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions: []
     actions:
       queue:
-        method: merge
-        name: default
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-

.golangci.yml

@@ -3,7 +3,6 @@ linters-settings:
     # TODO: enable and fix struct alignments
     #enable:
     #  - fieldalignment
-    check-shadowing: true
     settings:
       printf:
         funcs:
@@ -62,11 +61,12 @@ linters:
     # additional linters
     - bodyclose
     - gocritic
-    - goerr113
+    - err113
     - goimports
-    - gomnd
+    - mnd
     - misspell
     - noctx
+    - predeclared
     - stylecheck
     - whitespace
     - wsl
@@ -76,13 +76,13 @@ linters:
 run:
   build-tags:
     - gingonic
-  skip-dirs:
-    - scripts
-    - docker
-    - samples
   #modules-download-mode: vendor
 
 issues:
+  exclude-dirs:
+    - scripts
+    - docker
+    - samples
   exclude-rules:
     - linters:
         - gosec