File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -831,6 +831,7 @@ update-deps-in-gomod() {
831
831
[ -s go.sum ] && rm go.sum
832
832
833
833
GO111MODULE=on GOPRIVATE=" ${dep_packages} " GOPROXY=https://proxy.golang.org go mod download
834
+ fixAmbiguousImports
834
835
GOPROXY=" file://${GOPATH} /pkg/mod/cache/download,https://proxy.golang.org" GO111MODULE=on GOPRIVATE=" ${dep_packages} " go mod tidy
835
836
836
837
git add go.mod go.sum
@@ -853,6 +854,13 @@ update-deps-in-gomod() {
853
854
ensure-clean-working-dir
854
855
}
855
856
857
+ function fixAmbiguousImports() {
858
+ # ref: https://github.com/kubernetes/publishing-bot/issues/304
859
+ # TODO(nikhita): remove this when k/k drops or bumps
860
+ # cloud.google.com/go to a version > v0.105.0
861
+ go get cloud.google.com/go/compute/
[email protected]
862
+ }
863
+
856
864
gomod-pseudo-version () {
857
865
TZ=GMT git show -q --pretty=' format:v0.0.0-%cd-%h' --date=' format-local:%Y%m%d%H%M%S' --abbrev=12
858
866
}
You can’t perform that action at this time.
0 commit comments