From 25f9ceaf859eeb374807bbd0a69b7ceacb5d5d16 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@chainguard.dev>
Date: Mon, 4 Aug 2025 15:04:39 -0400
Subject: [PATCH] godot, actions fixup

---
 .github/mergify.yml  | 26 --------------------------
 .github/settings.yml | 28 ----------------------------
 .golangci.yml        |  5 ++++-
 3 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 .github/mergify.yml
 delete mode 100644 .github/settings.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
deleted file mode 100644
index 10834a9..0000000
--- a/.github/mergify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-queue_rules:
-  - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
-      - check-success=DCO
-      - check-success=build
-
-pull_request_rules:
-  - name: Automatic merge on approval
-    conditions:
-      - base=main
-      - "#approved-reviews-by>=1"
-      - "#changes-requested-reviews-by=0"
-      - "#review-requested=0"
-      - check-success=DCO
-      - check-success=build
-      - label!=do-not-merge
-      - label=ready-to-merge
-    actions:
-      queue:
-        method: merge
-        name: default
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-
-          {{ body }}
diff --git a/.github/settings.yml b/.github/settings.yml
deleted file mode 100644
index 3a6228c..0000000
--- a/.github/settings.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Collaborators: give specific users access to this repository.
-# See https://docs.github.com/en/rest/reference/repos#add-a-repository-collaborator for available options
-collaborators:
-  # Maintainers, should also be added to the .github/CODEOWNERS file as owners of this settings.yml file.
-  - username: tstromberg
-    permission: maintain
-  - username: chrisdoherty4
-    permission: maintain
-  # Approvers
-  - username: mmlb
-    permission: push
-  - username: stephen-fox
-    permission: push
-  # Reviewers
-  - username: displague
-    permission: triage
-  - username: jacobweinstock
-    permission: triage
-  - username: Raj-Dharwadkar
-    permission: triage
-
-  # Note: `permission` is only valid on organization-owned repositories.
-  # The permission to grant the collaborator. Can be one of:
-  # * `pull` - can pull, but not push to or administer this repository.
-  # * `push` - can pull and push, but not administer this repository.
-  # * `admin` - can pull, push and administer this repository.
-  # * `maintain` - Recommended for project managers who need to manage the repository without access to sensitive or destructive actions.
-  # * `triage` - Recommended for contributors who need to proactively manage issues and pull requests without write access.
diff --git a/.golangci.yml b/.golangci.yml
index 7636fa1..998a884 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -43,7 +43,6 @@ linters:
     - godox # TODO's are OK
     - ireturn # It's OK
     - musttag
-    - godot # dubious
     - nonamedreturns
     - goconst # finds repeated strings that could be replaced by a constant
     - goheader # checks is file header matches to pattern
@@ -140,6 +139,9 @@ linters:
     govet:
       enable-all: true
 
+    godot:
+      scope: toplevel
+
     inamedparam:
       # Skips check for interface methods with only a single parameter.
       skip-single-param: true
@@ -223,6 +225,7 @@ linters:
         linters:
           - dupl
           - gosec
+          - godot
           - noctx
           - perfsprint
           - revive