From 8348e82d3f7ec3a3cf50a43d492c7a5e60f1510e Mon Sep 17 00:00:00 2001 From: Neo2308 Date: Tue, 15 Aug 2023 16:02:00 +0530 Subject: [PATCH 1/2] Update to go 1.21 Updated to go 1.21 Updated min supported version to 1.20 --- .github/workflows/release.yaml | 2 +- .github/workflows/test.yaml | 2 +- ci/test.sh | 2 +- mockgen/internal/tests/generics/go.mod | 2 +- mockgen/internal/tests/typed/go.mod | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5a58641..ca43342 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,7 +20,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: 1.20.x + go-version: 1.21.x - name: Prepare release run: | diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 38a26a1..5f9165b 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.20.x, 1.21.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: diff --git a/ci/test.sh b/ci/test.sh index 8e57f4e..0f3fb6b 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -3,7 +3,7 @@ set -euo pipefail -if [[ $(go version) != *"go1.18"* ]]; then +if [[ $(go version) != *"go1.21"* ]]; then exit 0 fi diff --git a/mockgen/internal/tests/generics/go.mod b/mockgen/internal/tests/generics/go.mod index 0122445..18482fe 100644 --- a/mockgen/internal/tests/generics/go.mod +++ b/mockgen/internal/tests/generics/go.mod @@ -1,6 +1,6 @@ module go.uber.org/mock/mockgen/internal/tests/generics -go 1.19 +go 1.20 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..b1b4287 100644 --- a/mockgen/internal/tests/typed/go.mod +++ b/mockgen/internal/tests/typed/go.mod @@ -1,8 +1,8 @@ module go.uber.org/mock/mockgen/internal/tests/typed -go 1.18 +go 1.20 -replace go.uber.org/mock => ../../../.. +replace go.uber.org/mock => ../../../../ require ( go.uber.org/mock v0.0.0-00010101000000-000000000000 From 7ab1aaec21553ed9b4ba27fae4c2ccb447c42ddb Mon Sep 17 00:00:00 2001 From: Neo2308 Date: Tue, 15 Aug 2023 16:12:29 +0530 Subject: [PATCH 2/2] Minor change --- mockgen/internal/tests/typed/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockgen/internal/tests/typed/go.mod b/mockgen/internal/tests/typed/go.mod index b1b4287..8cfc50c 100644 --- a/mockgen/internal/tests/typed/go.mod +++ b/mockgen/internal/tests/typed/go.mod @@ -2,7 +2,7 @@ module go.uber.org/mock/mockgen/internal/tests/typed go 1.20 -replace go.uber.org/mock => ../../../../ +replace go.uber.org/mock => ../../../.. require ( go.uber.org/mock v0.0.0-00010101000000-000000000000