From cb05fa5f408c1084feb6ac5df7a930eecdb76ffb Mon Sep 17 00:00:00 2001
From: Mike Fisher <mfisher@gocardless.com>
Date: Fri, 17 May 2024 15:39:48 +0100
Subject: [PATCH] See if upgrading Go fixes CI build error

---
 .github/workflows/build-integration.yml | 8 ++++----
 .github/workflows/release.yml           | 2 +-
 .tool-versions                          | 2 +-
 Dockerfile                              | 2 +-
 README.md                               | 5 -----
 go.mod                                  | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-integration.yml b/.github/workflows/build-integration.yml
index 055d8e62..f41e31d9 100644
--- a/.github/workflows/build-integration.yml
+++ b/.github/workflows/build-integration.yml
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v3.5.3
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.5
+          go-version: 1.22.3
       - uses: actions/setup-node@v3
         with:
           node-version: 10
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v3.5.3
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.5
+          go-version: 1.22.3
       - name: Ensure no go vet errors
         run: |
           make vet
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v3.5.3
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.5
+          go-version: 1.22.3
       - name: Install go tooling and setup-envtest
         run: |
           make install-tools
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v3.5.3
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.5
+          go-version: 1.22.3
       - name: Build test binaries
         run: make bin/acceptance.linux
       - name: Install tooling
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dde5dad1..fa80fd5a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.20.5
+          go-version: 1.22.3
       - name: Create tag for new version
         run: |
           CURRENT_VERSION="v$(cat VERSION)"
diff --git a/.tool-versions b/.tool-versions
index e8249f49..a02c9a28 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1 @@
-golang 1.20.5
+golang 1.22.3
diff --git a/Dockerfile b/Dockerfile
index 677931fc..eac94627 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build Go binary without cgo dependencies
-FROM golang:1.20.5 as builder
+FROM golang:1.22.3 as builder
 WORKDIR /go/src/github.com/gocardless/theatre
 
 COPY . /go/src/github.com/gocardless/theatre
diff --git a/README.md b/README.md
index b0448280..e069ad74 100644
--- a/README.md
+++ b/README.md
@@ -76,12 +76,7 @@ all the necessary dependencies:
 
 ```shell
 make install-tools-homebrew
-make install-tools-kubebuilder
 make install-tools
-sudo mkdir /usr/local/kubebuilder
-curl -fsL "https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.1/kubebuilder_2.3.1_$(go env GOOS)_$(go env GOARCH).tar.gz" | \
-  sudo tar -xvz --strip=1 -C /usr/local/kubebuilder
-export KUBEBUILDER_ASSETS=/usr/local/kubebuilder/bin
 ```
 
 ## Local development environment
diff --git a/go.mod b/go.mod
index 61bd9983..8ceb338c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/gocardless/theatre/v3
 
-go 1.19
+go 1.22.0
 
 require (
 	cloud.google.com/go/pubsub v1.17.1