From fbbb4e9fad7f7468ff9796d64be059afa6760def Mon Sep 17 00:00:00 2001
From: Paul Lorenz <paul.lorenz@netfoundry.io>
Date: Wed, 8 May 2024 15:59:50 -0400
Subject: [PATCH] Tweaks to dependabot and actions

---
 .github/dependabot.yml              | 15 +++++++++++++++
 .github/workflows/golangci-lint.yml |  8 +++++---
 .github/workflows/main.yml          |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d921d0ff..e8a8fe8d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,3 +5,18 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  groups:
+    non-major:
+      applies-to: version-updates
+      update-types:
+        - "minor"
+        - "patch"
+
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+  groups:
+    all:
+      applies-to: version-updates
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 682e98bc..1c091499 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -11,15 +11,17 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v3
+
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.21.x'
-      - uses: actions/checkout@v3
+          go-version-file: ./go.mod
+
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.55.2
+          version: latest
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 287fbbed..c82fb9c3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.21.x'
+          go-version-file: ./go.mod
 
       - name: Install Ziti CI
         uses: openziti/ziti-ci@v1