From e1ea42c03d3ac41859fd60931e368a5b279fabaa Mon Sep 17 00:00:00 2001
From: NinjaCheetah <58050615+NinjaCheetah@users.noreply.github.com>
Date: Sun, 5 Apr 2026 21:29:23 -0400
Subject: [PATCH 1/2] (ci) Add lint workflow, update build workflow actions

---
 .github/workflows/go.yml            | 12 ++++--------
 .github/workflows/golangci-lint.yml | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/golangci-lint.yml

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 571f318a..436af402 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -4,23 +4,19 @@
 name: Go
 
 on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    types: [opened, synchronize, edited, ready_for_review, review_requested]
-    branches: [ "main" ]
+  [push, pull_request]
 
 jobs:
 
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v6
       with:
-        go-version: '1.24'
+        go-version: stable
 
     - name: Build
       run: go build -o discard -v ./cli
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
new file mode 100644
index 00000000..65dba154
--- /dev/null
+++ b/.github/workflows/golangci-lint.yml
@@ -0,0 +1,20 @@
+name: golangci-lint
+on:
+  [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
+        with:
+          go-version: stable
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v9
+        with:
+          version: v2.11

From 5a104d5fa1d0f06cefaaae6b6aa5bde9143162be Mon Sep 17 00:00:00 2001
From: Campbell <58050615+NinjaCheetah@users.noreply.github.com>
Date: Mon, 6 Apr 2026 13:24:45 -0400
Subject: [PATCH 2/2] Revert go.yml to specifying Go 1.25

---
 .github/workflows/go.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 436af402..169cf04a 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v6
       with:
-        go-version: stable
+        go-version: '1.25'
 
     - name: Build
       run: go build -o discard -v ./cli