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.

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

Conversation

chressie
Copy link
Contributor

Ran the following commands:

bazel build go/tools/releaser
sed -i /org_golang_x_tools-public-visibility.patch/d go/private/repositories.bzl
rm third_party/org_golang_x_tools-public-visibility.patch
bazel-bin/go/tools/releaser/releaser_/releaser upgrade-dep org_golang_x_tools

What type of PR is this?

Bug fix

What does this PR do? Why is it needed?

Updates x/tools repository dependency to 0.1.8, which is needed to support new export format version emitted by Go 1.18.

Which issues(s) does this PR fix?

Fixes #3030

Other notes for review

n/a

Ran the following commands:

bazel build go/tools/releaser
sed -i /org_golang_x_tools-public-visibility.patch/d go/private/repositories.bzl
rm third_party/org_golang_x_tools-public-visibility.patch
bazel-bin/go/tools/releaser/releaser_/releaser upgrade-dep org_golang_x_tools
Copy link
Contributor

@robfig robfig left a comment

Choose a reason for hiding this comment

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

Looks good, thanks

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

@robfig robfig merged commit d0d326e into bazelbuild:master Dec 16, 2021
@chressie
Copy link
Contributor Author

Perfect! Thanks a lot for the quick turnaround!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update x/tools to 0.1.8
2 participants