From bfa88db2ed3e979f46d65ca287e5b6d34b25436d Mon Sep 17 00:00:00 2001 From: Philipp Schrader Date: Thu, 5 Jan 2023 13:34:12 -0800 Subject: [PATCH] Re-enable the gazelle linter I don't understand exactly what's going on with the Go package mirroring. For some reason gazelle doesn't want to mirror the flatbuffers package. Possibly because we already have it defined in our workspace. Not sure. There's some magic somewhere that I don't have insight into. Regardless, we should explicitly point gazelle at our vendored version of flatbuffers. That's what this patch accomplishes. I think this was caused by https://github.com/google/flatbuffers/pull/7756 or https://github.com/google/flatbuffers/pull/7720, but I'm not sure. At least the timing matches. This patch effectively reverts Ibd850b77987625d359a38bf53d7db4ae9bc77dc2. Signed-off-by: Philipp Schrader Change-Id: I489d2150811bd00ab810a3038bbac2d0dc74ff6d --- BUILD | 1 + tools/lint/run-ci.sh | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BUILD b/BUILD index 331c4b6368..a568e203da 100644 --- a/BUILD +++ b/BUILD @@ -11,6 +11,7 @@ exports_files([ # gazelle:go_generate_proto false # gazelle:exclude third_party # gazelle:exclude external +# gazelle:resolve go github.com/google/flatbuffers/go @com_github_google_flatbuffers//go:go_default_library # gazelle:resolve go github.com/phst/runfiles @com_github_phst_runfiles//:go_default_library # gazelle:resolve go github.com/frc971/971-Robot-Code/build_tests/fbs //build_tests:test_go_fbs # gazelle:resolve go github.com/frc971/971-Robot-Code/scouting/webserver/requests/messages/error_response //scouting/webserver/requests/messages:error_response_go_fbs diff --git a/tools/lint/run-ci.sh b/tools/lint/run-ci.sh index a05aa0ffcb..6e026ee78b 100755 --- a/tools/lint/run-ci.sh +++ b/tools/lint/run-ci.sh @@ -111,12 +111,11 @@ git_status_is_clean() { # All the linters that we are going to run. readonly -a LINTERS=( gofmt - # TODO(phil): Re-enable these. No idea what's going on. - #gomod - #update_go_repos - #gazelle - #tweak_gazelle_go_deps - #clean_up_go_mirrors + gomod + update_go_repos + gazelle + tweak_gazelle_go_deps + clean_up_go_mirrors rustfmt cargo_lockfile cargo_raze