Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update x/tools repository to v0.1.8 #3030 #3031

Merged
merged 1 commit into from
Dec 16, 2021
Merged

Update x/tools repository to v0.1.8 #3030 #3031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions go/private/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,20 @@ def go_rules_dependencies(is_rules_go = False):
_maybe(
http_archive,
name = "org_golang_x_tools",
# v0.1.7, latest as of 2021-10-06
# v0.1.8, latest as of 2021-12-15
urls = [
"https://mirror.bazel.build/github.com/golang/tools/archive/v0.1.7.zip",
"https://github.com/golang/tools/archive/v0.1.7.zip",
"https://mirror.bazel.build/github.com/golang/tools/archive/v0.1.8.zip",
"https://github.com/golang/tools/archive/v0.1.8.zip",
],
sha256 = "c069fd1d1dcbbfd2e396993307adf0edde5ef5d419c5db92649ab8cfabec255e",
strip_prefix = "tools-0.1.7",
sha256 = "aec8a9ade0974bafc290bad1c53fa2b4d2b87ac8a90bf5340ded216ff81d1b2a",
strip_prefix = "tools-0.1.8",
patches = [
# deletegopls removes the gopls subdirectory. It contains a nested
# module with additional dependencies. It's not needed by rules_go.
# releaser:patch-cmd rm -rf gopls
"@io_bazel_rules_go//third_party:org_golang_x_tools-deletegopls.patch",
# releaser:patch-cmd gazelle -repo_root . -go_prefix golang.org/x/tools -go_naming_convention import_alias
"@io_bazel_rules_go//third_party:org_golang_x_tools-gazelle.patch",
"@io_bazel_rules_go//third_party:org_golang_x_tools-public-visibility.patch",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed that this patch is no longer necessary when using Gazelle 0.24 due to hard-coded support added in gazelle's commit 3ea1d64d6fe943dac06c341f9a265472bb99acd7

At first I was worried about unnecessarily increasing the minimum required version of Gazelle, but it looks like there is already a compatibility requirement, referring to:
https://github.com/bazelbuild/bazel-gazelle#compatibility-with-rules_go

],
patch_args = ["-p1"],
)
Expand Down
Loading