From 47cf033feb2f54e9bd224215f0607bdb0d1904eb Mon Sep 17 00:00:00 2001
From: Jim McDonald <Jim@mcdee.net>
Date: Tue, 1 Oct 2024 13:18:52 +0100
Subject: [PATCH] Update workflows.

---
 .github/workflows/golangci-lint.yml | 13 +++++++------
 .github/workflows/release.yml       | 19 +++++++++++--------
 .github/workflows/test.yml          |  7 ++++---
 Dockerfile                          |  2 +-
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index afedb41..51c46cf 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -1,23 +1,24 @@
 name: golangci-lint
 on:
   push:
-    tags:
-      - v*
     branches:
-    - master
+      - master
   pull_request:
+
 permissions:
   contents: read
+
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '^1.21'
+          cache: false
+          go-version: '^1.22'
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           only-new-issues: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a76718b..57461d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,8 +3,8 @@ name: Release
 on:
   push:
     tags:
-    - 'v*'
-    - 't*'
+      - 'v*'
+      - 't*'
 
 jobs:
   # Set variables that will be available to all builds.
@@ -44,9 +44,10 @@ jobs:
     needs: [create_release, env_vars]
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '^1.21'
+          cache: false
+          go-version: '^1.22'
 
       - name: Check out repository into the Go module directory
         uses: actions/checkout@v4
@@ -119,9 +120,10 @@ jobs:
     needs: [create_release, env_vars]
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '^1.21'
+          cache: false
+          go-version: '^1.22'
 
       - name: Check out repository into the Go module directory
         uses: actions/checkout@v4
@@ -164,9 +166,10 @@ jobs:
     needs: [create_release, env_vars]
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '^1.21'
+          cache: false
+          go-version: '^1.22'
 
       - name: Check out repository into the Go module directory
         uses: actions/checkout@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9167aca..d0153ae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,14 +2,15 @@ name: test
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '^1.21'
+          cache: false
+          go-version: '^1.22'
       - uses: actions/checkout@v4
       - uses: n8maninger/action-golang-test@v1
diff --git a/Dockerfile b/Dockerfile
index 26e0cb0..c5fd3cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21-bookworm as builder
+FROM golang:1.22-bookworm as builder
 
 WORKDIR /app