From 7f14e2ea73b801a6f4f16333f098621fd054d62b Mon Sep 17 00:00:00 2001
From: lance6716 <lance6716@gmail.com>
Date: Thu, 28 Mar 2024 17:55:25 +0800
Subject: [PATCH 1/3] Enable integration tests when go version is not 1.18

Signed-off-by: lance6716 <lance6716@gmail.com>
---
 ci/test.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ci/test.sh b/ci/test.sh
index 8e57f4e..27092bd 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -3,10 +3,6 @@
 
 set -euo pipefail
 
-if [[ $(go version) != *"go1.18"* ]]; then
-  exit 0
-fi
-
 for i in $(find $PWD -name go.mod); do
   pushd $(dirname $i)
   go mod tidy

From 199da5b62bd29d2b212c1b6a0703309a814667ac Mon Sep 17 00:00:00 2001
From: lance6716 <lance6716@gmail.com>
Date: Thu, 11 Apr 2024 18:59:42 +0800
Subject: [PATCH 2/3] update go version

Signed-off-by: lance6716 <lance6716@gmail.com>
---
 .github/workflows/test.yaml | 2 +-
 go.mod                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 38a26a1..f85263c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -15,7 +15,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.19.x, 1.20.x]
+        go-version: [1.21.x, 1.22.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/go.mod b/go.mod
index 4826710..c6522df 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module go.uber.org/mock
 
-go 1.20
+go 1.21
 
 require (
 	golang.org/x/mod v0.15.0

From ab61ec7b7f95d3552e4acaaf1bad2aed2ace35d0 Mon Sep 17 00:00:00 2001
From: lance6716 <lance6716@gmail.com>
Date: Fri, 12 Apr 2024 10:39:36 +0800
Subject: [PATCH 3/3] fix go mod tidy

Signed-off-by: lance6716 <lance6716@gmail.com>
---
 mockgen/internal/tests/generics/go.mod | 4 +++-
 mockgen/internal/tests/typed/go.mod    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mockgen/internal/tests/generics/go.mod b/mockgen/internal/tests/generics/go.mod
index 0122445..3bbff83 100644
--- a/mockgen/internal/tests/generics/go.mod
+++ b/mockgen/internal/tests/generics/go.mod
@@ -1,6 +1,8 @@
 module go.uber.org/mock/mockgen/internal/tests/generics
 
-go 1.19
+go 1.21
+
+toolchain go1.21.2
 
 require (
 	go.uber.org/mock v1.6.0
diff --git a/mockgen/internal/tests/typed/go.mod b/mockgen/internal/tests/typed/go.mod
index 831bf3b..e7952ac 100644
--- a/mockgen/internal/tests/typed/go.mod
+++ b/mockgen/internal/tests/typed/go.mod
@@ -1,6 +1,8 @@
 module go.uber.org/mock/mockgen/internal/tests/typed
 
-go 1.18
+go 1.21
+
+toolchain go1.21.2
 
 replace go.uber.org/mock => ../../../..