From 42a6a4951b365d472515de40c1b0b20119dc431a Mon Sep 17 00:00:00 2001 From: Steve Coffman Date: Fri, 14 Feb 2025 18:13:14 -0500 Subject: [PATCH] support all go versions 1.22, 1.23, 1.24 by using golang.org/x/tools@v0.25.0 (#3537) * Update matrix to include Go 1.24 Signed-off-by: Steve Coffman * Update go get golang.org/x/tools@v0.25.0 Signed-off-by: Steve Coffman * Update go minor version Signed-off-by: Steve Coffman * Update golangci-lint versions Signed-off-by: Steve Coffman * Linter no longer complains Signed-off-by: Steve Coffman * Update linter Signed-off-by: Steve Coffman --------- Signed-off-by: Steve Coffman --- .github/workflows/coverage.yml | 2 +- .github/workflows/fmt-and-generate.yml | 2 +- .github/workflows/integration.yml | 10 +++++----- .github/workflows/lint.yml | 6 +++--- .github/workflows/test.yml | 2 +- _examples/go.mod | 6 +++--- _examples/go.sum | 8 ++++---- _examples/websocket-initfunc/server/go.mod | 2 +- client/incremental_http.go | 3 ++- go.mod | 6 +++--- go.sum | 8 ++++---- 11 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 91da5ddf448..4165eaba0a8 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -16,7 +16,7 @@ jobs: coverage: strategy: matrix: - go: ["1.23"] + go: ["1.24"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/fmt-and-generate.yml b/.github/workflows/fmt-and-generate.yml index 819a1a8b706..f2869acec1f 100644 --- a/.github/workflows/fmt-and-generate.yml +++ b/.github/workflows/fmt-and-generate.yml @@ -16,7 +16,7 @@ jobs: fmt-and-lint: strategy: matrix: - go: ["1.22", "1.23"] + go: ["1.22", "1.23", "1.24"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 226f746de66..eca2c631df5 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -16,8 +16,8 @@ jobs: integration: strategy: matrix: - go: ["1.22", "1.23"] - node: [18] + go: ["1.22", "1.23", "1.24"] + node: [22] runs-on: ubuntu-latest timeout-minutes: 3 steps: @@ -35,8 +35,8 @@ jobs: federation: strategy: matrix: - go: ["1.22", "1.23"] - node: [18] + go: ["1.22", "1.23", "1.24"] + node: [22] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -53,7 +53,7 @@ jobs: init: strategy: matrix: - go: ["1.22", "1.23"] + go: ["1.22", "1.23", "1.24"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3cd1dada12a..09fccd20d83 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -15,10 +15,10 @@ concurrency: jobs: golangci-lint: env: - GOLANGCI_LINT_VERSION: v1.62.0 + GOLANGCI_LINT_VERSION: v1.64.5 strategy: matrix: - go: ["1.22", "1.23"] + go: ["1.22", "1.23", "1.24"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -26,7 +26,7 @@ jobs: with: go-version: ${{ matrix.go }} - name: golangci-lint - uses: golangci/golangci-lint-action@v6.3.1 + uses: golangci/golangci-lint-action@v6.4.1 with: version: ${{ env.GOLANGCI_LINT_VERSION }} - name: golangci-lint examples diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b772100705..6eba4d01a74 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - go: ["1.22", "1.23"] + go: ["1.22", "1.23", "1.24"] runs-on: ${{ matrix.os }} continue-on-error: true steps: diff --git a/_examples/go.mod b/_examples/go.mod index 5a85edd87a7..da258eaad19 100644 --- a/_examples/go.mod +++ b/_examples/go.mod @@ -1,6 +1,6 @@ module github.com/99designs/gqlgen/_examples -go 1.22.5 +go 1.22.12 replace github.com/99designs/gqlgen => ../ @@ -25,9 +25,9 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sosodev/duration v1.3.1 // indirect - golang.org/x/mod v0.20.0 // indirect + golang.org/x/mod v0.21.0 // indirect golang.org/x/sys v0.29.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/tools v0.25.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/_examples/go.sum b/_examples/go.sum index af302eda9c4..17c003b14a7 100644 --- a/_examples/go.sum +++ b/_examples/go.sum @@ -46,8 +46,8 @@ github.com/vektah/dataloaden v0.3.0/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf github.com/vektah/gqlparser/v2 v2.5.22 h1:yaaeJ0fu+nv1vUMW0Hl+aS1eiv1vMfapBNjpffAda1I= github.com/vektah/gqlparser/v2 v2.5.22/go.mod h1:xMl+ta8a5M1Yo1A1Iwt/k7gSpscwSnHZdw7tfhEGfTM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= @@ -62,8 +62,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/_examples/websocket-initfunc/server/go.mod b/_examples/websocket-initfunc/server/go.mod index 60cc0d94948..6ec0eee3a20 100644 --- a/_examples/websocket-initfunc/server/go.mod +++ b/_examples/websocket-initfunc/server/go.mod @@ -1,6 +1,6 @@ module github.com/gqlgen/_examples/websocket-initfunc/server -go 1.22.5 +go 1.22.12 require ( github.com/99designs/gqlgen v0.17.63 diff --git a/client/incremental_http.go b/client/incremental_http.go index d1c2507d2ee..fa641d22c54 100644 --- a/client/incremental_http.go +++ b/client/incremental_http.go @@ -94,7 +94,8 @@ func (p *Client) IncrementalHTTP(ctx context.Context, query string, options ...O w := httptest.NewRecorder() p.h.ServeHTTP(w, r) - res := w.Result() //nolint:bodyclose // Remains open since we are reading from it incrementally. + // Remains open since we are reading from it incrementally. + res := w.Result() if res.StatusCode >= http.StatusBadRequest { return errorIncremental(fmt.Errorf("http %d: %s", w.Code, w.Body.String())) } diff --git a/go.mod b/go.mod index 05f97bb8290..5184ca141cf 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/99designs/gqlgen -go 1.22.5 +go 1.22.12 require ( github.com/PuerkitoBio/goquery v1.9.3 @@ -18,7 +18,7 @@ require ( github.com/urfave/cli/v2 v2.27.5 github.com/vektah/gqlparser/v2 v2.5.22 golang.org/x/text v0.22.0 - golang.org/x/tools v0.24.0 + golang.org/x/tools v0.25.0 google.golang.org/protobuf v1.36.5 gopkg.in/yaml.v3 v3.0.1 ) @@ -31,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect - golang.org/x/mod v0.20.0 // indirect + golang.org/x/mod v0.21.0 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.11.0 // indirect golang.org/x/sys v0.29.0 // indirect diff --git a/go.sum b/go.sum index f33cf994eec..dbd44ec2d0d 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -94,8 +94,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=