From ba134ca527f08f73a748b0bc527ecee797be1386 Mon Sep 17 00:00:00 2001 From: Erik Seliger Date: Mon, 8 Jan 2024 22:20:24 +0100 Subject: [PATCH] Bump go-mockgen to include lenient type checking (#59397) Camden added https://github.com/derision-test/go-mockgen/commit/4fea34868d8b36024f9a62eca1387596efe110dc to the tool so that we don't have to have a functioning build when mocks need to be regenerated, which can sometimes cause a cyclic issue. ### Test plan Ran generate and it worked. --- deps.bzl | 4 ++-- gen.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- lib/go.mod | 2 +- lib/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deps.bzl b/deps.bzl index 7b2119971fb..fb02505cb25 100644 --- a/deps.bzl +++ b/deps.bzl @@ -1460,8 +1460,8 @@ def go_dependencies(): name = "com_github_derision_test_go_mockgen", build_file_proto_mode = "disable_global", importpath = "github.com/derision-test/go-mockgen", - sum = "h1:b/DXAXL2FkaRPpnbYK3ODdZzklmJAwox0tkc6yyXx74=", - version = "v1.3.7", + sum = "h1:Wo7vx8f7QdBT4jxfgTvs2t9VpyFlvvqzjXoE3m7MQBU=", + version = "v1.3.8-0.20240105000756-fb9effb23d90", ) go_repository( name = "com_github_dghubble_go_twitter", diff --git a/gen.go b/gen.go index 3fb49e1cb79..4a5bc67bbbe 100644 --- a/gen.go +++ b/gen.go @@ -2,4 +2,4 @@ package sourcegraph // Keep these versions in sync with go.mod //go:generate env GOBIN=$PWD/.bin GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.1.10 -//go:generate go run github.com/derision-test/go-mockgen/cmd/go-mockgen@v1.3.7 +//go:generate go run github.com/derision-test/go-mockgen/cmd/go-mockgen@v1.3.8-0.20240105000756-fb9effb23d90 diff --git a/go.mod b/go.mod index 2829069eaba..6f12c5965b7 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/daviddengcn/go-colortext v1.0.0 github.com/derision-test/glock v1.0.0 - github.com/derision-test/go-mockgen v1.3.7 + github.com/derision-test/go-mockgen v1.3.8-0.20240105000756-fb9effb23d90 github.com/dgraph-io/ristretto v0.1.1 github.com/distribution/distribution/v3 v3.0.0-20220128175647-b60926597a1b github.com/dnaeon/go-vcr v1.2.0 diff --git a/go.sum b/go.sum index eab0fc7ffa3..a368e6333cf 100644 --- a/go.sum +++ b/go.sum @@ -432,8 +432,8 @@ github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgz github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/derision-test/glock v1.0.0 h1:b6sViZG+Cm6QtdpqbfWEjaBVbzNPntIS4GzsxpS+CmM= github.com/derision-test/glock v1.0.0/go.mod h1:jKtLdBMrF+XQatqvg46wiWdDfDSSDjdhO4dOM2FX9H4= -github.com/derision-test/go-mockgen v1.3.7 h1:b/DXAXL2FkaRPpnbYK3ODdZzklmJAwox0tkc6yyXx74= -github.com/derision-test/go-mockgen v1.3.7/go.mod h1:/TXUePlhtHmDDCaDAi/a4g6xOHqMDz3Wf0r2NPGskB4= +github.com/derision-test/go-mockgen v1.3.8-0.20240105000756-fb9effb23d90 h1:Wo7vx8f7QdBT4jxfgTvs2t9VpyFlvvqzjXoE3m7MQBU= +github.com/derision-test/go-mockgen v1.3.8-0.20240105000756-fb9effb23d90/go.mod h1:/TXUePlhtHmDDCaDAi/a4g6xOHqMDz3Wf0r2NPGskB4= github.com/dghubble/gologin/v2 v2.4.0 h1:Ga0dxZ2C/8MrMtC0qFLIg1K7cVjZQWSbTj/MIgFqMAg= github.com/dghubble/gologin/v2 v2.4.0/go.mod h1:85FO9Je/O6n9/KdHTUtVDSaXQjR6Ducx7blL/3CUfnw= github.com/dghubble/sling v1.4.1 h1:AxjTubpVyozMvbBCtXcsWEyGGgUZutC5YGrfxPNVOcQ= diff --git a/lib/go.mod b/lib/go.mod index 9749b0505bd..a2eca1afa76 100644 --- a/lib/go.mod +++ b/lib/go.mod @@ -7,7 +7,7 @@ require ( github.com/charmbracelet/glamour v0.5.0 github.com/cockroachdb/errors v1.11.1 github.com/cockroachdb/redact v1.1.5 - github.com/derision-test/go-mockgen v1.3.7 + github.com/derision-test/go-mockgen v1.3.8-0.20240105000756-fb9effb23d90 github.com/fatih/color v1.15.0 github.com/ghodss/yaml v1.0.0 github.com/go-enry/go-enry/v2 v2.8.4 diff --git a/lib/go.sum b/lib/go.sum index bbbe94e7df2..42dfaf70ed7 100644 --- a/lib/go.sum +++ b/lib/go.sum @@ -54,8 +54,8 @@ github.com/dave/rebecca v0.9.1/go.mod h1:N6XYdMD/OKw3lkF3ywh8Z6wPGuwNFDNtWYEMFWE github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/derision-test/go-mockgen v1.3.7 h1:b/DXAXL2FkaRPpnbYK3ODdZzklmJAwox0tkc6yyXx74= -github.com/derision-test/go-mockgen v1.3.7/go.mod h1:/TXUePlhtHmDDCaDAi/a4g6xOHqMDz3Wf0r2NPGskB4= +github.com/derision-test/go-mockgen v1.3.8-0.20240105000756-fb9effb23d90 h1:Wo7vx8f7QdBT4jxfgTvs2t9VpyFlvvqzjXoE3m7MQBU= +github.com/derision-test/go-mockgen v1.3.8-0.20240105000756-fb9effb23d90/go.mod h1:/TXUePlhtHmDDCaDAi/a4g6xOHqMDz3Wf0r2NPGskB4= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo= github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=