From bdbf17d41d609c394b5356e6f929306bce96618e Mon Sep 17 00:00:00 2001
From: Dominic Evans <dominic.evans@uk.ibm.com>
Date: Thu, 17 Mar 2022 14:51:38 +0000
Subject: [PATCH 1/2] chore: bump golangci-lint to v1.45.0

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 355876aad..0b54ad3a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,7 +52,7 @@ jobs:
       env:
         GOFLAGS: -tags=functional
       with:
-        version: v1.44.0
+        version: v1.45.0
 
     - name: Test (Unit)
       run: make test

From 81bb5dd264181d5f7ad85c6a7984a609e0ed594c Mon Sep 17 00:00:00 2001
From: Dominic Evans <dominic.evans@uk.ibm.com>
Date: Thu, 17 Mar 2022 14:50:22 +0000
Subject: [PATCH 2/2] chore: bump CI along to Go 1.17 + 1.18

- also bump setup-go action to v3 branch
---
 .github/workflows/ci.yml              | 10 +++++-----
 .github/workflows/codeql-analysis.yml |  6 +++---
 .github/workflows/fuzz.yml            |  9 +++------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b54ad3a9..44792a079 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.16.x, 1.17.x]
+        go-version: [1.17.x, 1.18.x]
         kafka-version: [2.8.1, 3.0.0, 3.1.0]
         platform: [ubuntu-latest]
 
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Setup Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version }}
 
@@ -48,7 +48,7 @@ jobs:
 
     - name: Lint
       uses: golangci/golangci-lint-action@v2
-      if: ${{ matrix.go-version == '1.17.x' }}
+      if: ${{ matrix.go-version == '1.18.x' }}
       env:
         GOFLAGS: -tags=functional
       with:
@@ -56,8 +56,8 @@ jobs:
 
     - name: Test (Unit)
       run: make test
-      if: ${{ matrix.go-version != '1.17.x' }}
+      if: ${{ matrix.go-version != '1.18.x' }}
 
     - name: Test (Functional)
       run: make test_functional
-      if: ${{ matrix.go-version == '1.17.x' }}
+      if: ${{ matrix.go-version == '1.18.x' }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0f8a38e5b..3b35d3ee2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,10 +31,10 @@ jobs:
       with:
         languages: ${{ matrix.language }}
 
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v2
+    - name: Setup Go
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16
+        go-version: 1.17
 
     - name: Autobuild
       uses: github/codeql-action/autobuild@v1
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index a9197fc23..02be6088e 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -18,9 +18,9 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Setup Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
 
     - name: Get Go environment
       id: go-env
@@ -38,8 +38,5 @@ jobs:
         restore-keys: |
           fuzz-go-
 
-    - name: Build Go tip
-      run: go install golang.org/dl/gotip@latest && gotip download
-
     - name: Run any fuzzing tests
-      run: gotip test -v -run=^Fuzz -test.fuzztime=5m ./...
+      run: go test -v -run=^Fuzz -test.fuzztime=5m ./...