diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 2404e8fa4..3a7f09a1f 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,7 +15,7 @@ jobs: matrix: go-version: [ # 1.19.x, # Ended 06 Sep 2023 - 1.20.x, # Ended 06 Feb 2024 + # 1.20.x, # Ended 06 Feb 2024 1.21.x, 1.22.x, ] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f347f2844..a74ae7674 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: # 1.17.x, # Ended 02 Aug 2022 # 1.18.x, # Ended 01 Feb 2023 # 1.19.x, # Ended 06 Sep 2023 - 1.20.x, # Ended 06 Feb 2024 + # 1.20.x, # Ended 06 Feb 2024 1.21.x, 1.22.x, ] @@ -65,12 +65,14 @@ jobs: strategy: fail-fast: false matrix: - go-version: ["1.20", "1.21", "1.22"] + go-version: ["1.21", "1.22"] steps: - uses: actions/checkout@v4 - name: Test dockerfile run: make docker_test_all + env: + GO_VERSION: ${{ matrix.go-version }} finish: needs: [test,test-containers] diff --git a/go.mod b/go.mod index 688b05903..5b975fbfa 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/pact-foundation/pact-go/v2 -go 1.20 +go 1.21 require ( github.com/golang/protobuf v1.5.4 diff --git a/go.sum b/go.sum index 01a252c2a..a069a3aa3 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,7 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=