Remove synthetic GOPATH and symlinks
As it turns out, `go mod tidy` complains about missing modules
but still properly generates go.mod, so it appears that we do
not need a GOPATH or symlinks except for non-IntelliJ IDE support.
We should standardize on IntelliJ and just get rid of this
workaround. Hendrik had trouble rebasing the shield revisions
(that have a lot of generated code) and it's likely a lot of
work to maintain this hack in the future.
See D305, D309
Test Plan:
Ran `scripts/gazelle.sh` after deleting all symlinks
and tested that `go mod tidy` properly restored the go.mod file
after modifying it manually.
X-Origin-Diff: phab/D311
GitOrigin-RevId: fe4bc491fca6fa072cff047185d7c18305564ea4
diff --git a/BUILD b/BUILD
index 9431197..99080be 100644
--- a/BUILD
+++ b/BUILD
@@ -57,13 +57,3 @@
"@org_golang_x_tools//go/analysis/passes/unusedresult:go_tool_library",
],
)
-
-# Synthesize a fake GOPATH in bazel-bin/gopath for IDEs without Bazel support
-go_path(
- name = "gopath",
- mode = "link",
- deps = [
- # All top-level Go targets that need IDE integration need to be listed here
- "//core/cmd/init",
- ],
-)
diff --git a/README.md b/README.md
index a485922..eb40c08 100644
--- a/README.md
+++ b/README.md
@@ -17,20 +17,6 @@
Running commands: `scripts/run_in_container.sh <...>`
Using bazel using a wrapper script: `scripts/bin/bazel <...>` (add to your local $PATH for convenience)
-
-#### Creating local symlinks for generated Go code
-
-Unfortunately, the Go tooling does not yet know about Bazel, so we need to copy generated code to
-the source tree such that native Go modules work.
-
-This creates a fake GOPATH and symlinks for generated packages:
-
- scripts/symlink_generated_files.sh
- bazel build :gopath
-
-Any top-level Go targets that use generated code have to be dependencies of the :gopath target.
-
-See https://phab.monogon.dev/D305 for details.
#### IntelliJ
diff --git a/scripts/gazelle.sh b/scripts/gazelle.sh
index 970f6ba..f989625 100755
--- a/scripts/gazelle.sh
+++ b/scripts/gazelle.sh
@@ -2,8 +2,6 @@
# gazelle.sh regenerates BUILD.bazel files for Go source files.
set -euo pipefail
-scripts/symlink_generated_files.sh
-
-bazel run //:go mod tidy
+! bazel run //:go mod tidy
bazel run //:gazelle -- update
bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=repositories.bzl%go_repositories -prune=true
diff --git a/scripts/symlink_generated_files.sh b/scripts/symlink_generated_files.sh
deleted file mode 100755
index 5596efd..0000000
--- a/scripts/symlink_generated_files.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-create_symlinks() {
- local package=$1
-
- rm -rf "$package"
- ln -r -s "bazel-bin/gopath/src/git.monogon.dev/source/nexantic.git/$package" "$package"
-}
-
-create_symlinks core/generated