From a97c9813b0b6ec1ed82be889487716f4a99f1419 Mon Sep 17 00:00:00 2001 From: Jay Conrod Date: Wed, 23 Dec 2020 12:30:59 -0500 Subject: [PATCH 1/4] Test Go 1.16beta1 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 06b0a38d78..4830a0a960 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -6,7 +6,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies(is_rules_go = True) -go_register_toolchains(version = "1.15.5") +go_register_toolchains(version = "1.16beta1") http_archive( name = "com_google_protobuf", From b6dd5bae7931d48535bf3d65bc2e6ba0281579e5 Mon Sep 17 00:00:00 2001 From: Jay Conrod Date: Wed, 23 Dec 2020 13:49:24 -0500 Subject: [PATCH 2/4] upgrade Gazelle for 1.16 compatibility --- WORKSPACE | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 4830a0a960..02ee68df31 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -76,15 +76,21 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -http_archive( +git_repository( name = "bazel_gazelle", - sha256 = "b85f48fa105c4403326e9525ad2b2cc437babaa6e15a3fc0b1dbab0ab064bc7c", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.2/bazel-gazelle-v0.22.2.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.2/bazel-gazelle-v0.22.2.tar.gz", - ], + commit = "d59758372cf615fae5544fcf43cfdbbdc2e5ad5a", + remote = "https://github.com/jayconrod/bazel-gazelle.git", ) +# http_archive( +# name = "bazel_gazelle", +# sha256 = "b85f48fa105c4403326e9525ad2b2cc437babaa6e15a3fc0b1dbab0ab064bc7c", +# urls = [ +# "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.2/bazel-gazelle-v0.22.2.tar.gz", +# "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.2/bazel-gazelle-v0.22.2.tar.gz", +# ], +# ) + load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies() From 8c4bef0496ef233b79096404a897251315645eb2 Mon Sep 17 00:00:00 2001 From: Jay Conrod Date: Wed, 23 Dec 2020 13:49:52 -0500 Subject: [PATCH 3/4] Set GO111MODULE=off in go_info --- go/tools/builders/info.go | 1 + 1 file changed, 1 insertion(+) diff --git a/go/tools/builders/info.go b/go/tools/builders/info.go index e0586a8275..1475cf02d5 100644 --- a/go/tools/builders/info.go +++ b/go/tools/builders/info.go @@ -38,6 +38,7 @@ func run(args []string) error { if err := goenv.checkFlags(); err != nil { return err } + os.Setenv("GO111MODULE", "off") f := os.Stderr if filename != "" { var err error From ff572bcbaafad7d2d61ae010c4579d5026cc09ba Mon Sep 17 00:00:00 2001 From: Jay Conrod Date: Wed, 23 Dec 2020 15:17:40 -0500 Subject: [PATCH 4/4] Switch to Gazelle v0.22.3 --- WORKSPACE | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 02ee68df31..e3b889375d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -76,21 +76,15 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() -git_repository( +http_archive( name = "bazel_gazelle", - commit = "d59758372cf615fae5544fcf43cfdbbdc2e5ad5a", - remote = "https://github.com/jayconrod/bazel-gazelle.git", + sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz", + ], ) -# http_archive( -# name = "bazel_gazelle", -# sha256 = "b85f48fa105c4403326e9525ad2b2cc437babaa6e15a3fc0b1dbab0ab064bc7c", -# urls = [ -# "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.2/bazel-gazelle-v0.22.2.tar.gz", -# "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.2/bazel-gazelle-v0.22.2.tar.gz", -# ], -# ) - load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") gazelle_dependencies()