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

Use repo-relative labels where easily possible #3038

Merged
merged 8 commits into from
Jan 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions go/deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
# anything has been declared.

load(
"@io_bazel_rules_go//go/private:repositories.bzl",
"//go/private:repositories.bzl",
_go_rules_dependencies = "go_rules_dependencies",
)
load(
"@io_bazel_rules_go//go/private:sdk.bzl",
"//go/private:sdk.bzl",
_go_download_sdk = "go_download_sdk",
_go_host_sdk = "go_host_sdk",
_go_local_sdk = "go_local_sdk",
Expand Down
2 changes: 1 addition & 1 deletion go/platform/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ filegroup(
bzl_library(
name = "list",
srcs = ["list.bzl"],
deps = ["@io_bazel_rules_go//go/private:platforms"],
deps = ["//go/private:platforms"],
)

bzl_library(
Expand Down
14 changes: 7 additions & 7 deletions go/platform/list.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

load(
"@io_bazel_rules_go//go/private:platforms.bzl",
"//go/private:platforms.bzl",
_GOARCH = "GOARCH_CONSTRAINTS",
_GOOS = "GOOS_CONSTRAINTS",
_GOOS_GOARCH = "GOOS_GOARCH",
Expand All @@ -38,19 +38,19 @@ def declare_config_settings():
for goos in GOOS:
native.config_setting(
name = goos,
constraint_values = ["@io_bazel_rules_go//go/toolchain:" + goos],
constraint_values = [Label("//go/toolchain:" + goos)],
)
for goarch in GOARCH:
native.config_setting(
name = goarch,
constraint_values = ["@io_bazel_rules_go//go/toolchain:" + goarch],
constraint_values = [Label("//go/toolchain:" + goarch)],
)
for goos, goarch in GOOS_GOARCH:
native.config_setting(
name = goos + "_" + goarch,
constraint_values = [
"@io_bazel_rules_go//go/toolchain:" + goos,
"@io_bazel_rules_go//go/toolchain:" + goarch,
Label("//go/toolchain:" + goos),
Label("//go/toolchain:" + goarch),
],
)

Expand All @@ -59,6 +59,6 @@ def declare_config_settings():
# to build settings.
native.config_setting(
name = "internal_cgo_off",
constraint_values = ["@io_bazel_rules_go//go/toolchain:cgo_off"],
visibility = ["@io_bazel_rules_go//:__pkg__"],
constraint_values = [Label("//go/toolchain:cgo_off")],
visibility = [Label("//:__pkg__")],
)
28 changes: 14 additions & 14 deletions go/private/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ bzl_library(
srcs = ["go_toolchain.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"@io_bazel_rules_go//go/private:platforms",
"@io_bazel_rules_go//go/private:providers",
"@io_bazel_rules_go//go/private/actions:archive",
"@io_bazel_rules_go//go/private/actions:asm",
"@io_bazel_rules_go//go/private/actions:binary",
"@io_bazel_rules_go//go/private/actions:compile",
"@io_bazel_rules_go//go/private/actions:cover",
"@io_bazel_rules_go//go/private/actions:link",
"@io_bazel_rules_go//go/private/actions:pack",
"@io_bazel_rules_go//go/private/actions:stdlib",
"//go/private:platforms",
"//go/private:providers",
"//go/private/actions:archive",
"//go/private/actions:asm",
"//go/private/actions:binary",
"//go/private/actions:compile",
"//go/private/actions:cover",
"//go/private/actions:link",
"//go/private/actions:pack",
"//go/private/actions:stdlib",
],
)

Expand All @@ -101,10 +101,10 @@ bzl_library(
srcs = ["sdk.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"@io_bazel_rules_go//go/private:common",
"@io_bazel_rules_go//go/private:nogo",
"@io_bazel_rules_go//go/private:platforms",
"@io_bazel_rules_go//go/private/skylib/lib:versions",
"//go/private:common",
"//go/private:nogo",
"//go/private:platforms",
"//go/private/skylib/lib:versions",
],
)

Expand Down
8 changes: 4 additions & 4 deletions go/private/BUILD.sdk.bazel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@io_bazel_rules_go//go/private/rules:binary.bzl", "go_tool_binary")
load("@io_bazel_rules_go//go/private/rules:sdk.bzl", "package_list")
load("@io_bazel_rules_go//go:def.bzl", "declare_toolchains", "go_sdk")
load("@{rules_go_repo_name}//go/private/rules:binary.bzl", "go_tool_binary")
achew22 marked this conversation as resolved.
Show resolved Hide resolved
load("@{rules_go_repo_name}//go/private/rules:sdk.bzl", "package_list")
load("@{rules_go_repo_name}//go:def.bzl", "declare_toolchains", "go_sdk")

package(default_visibility = ["//visibility:public"])

Expand Down Expand Up @@ -42,7 +42,7 @@ go_sdk(

go_tool_binary(
name = "builder",
srcs = ["@io_bazel_rules_go//go/tools/builders:builder_srcs"],
srcs = ["@{rules_go_repo_name}//go/tools/builders:builder_srcs"],
sdk = ":go_sdk",
)

Expand Down
32 changes: 16 additions & 16 deletions go/private/actions/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,45 +18,45 @@ bzl_library(
srcs = ["archive.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"@io_bazel_rules_go//go/private:common",
"@io_bazel_rules_go//go/private:mode",
"@io_bazel_rules_go//go/private:providers",
"@io_bazel_rules_go//go/private/actions:compilepkg",
"@io_bazel_rules_go//go/private/rules:cgo",
"//go/private:common",
"//go/private:mode",
"//go/private:providers",
"//go/private/actions:compilepkg",
"//go/private/rules:cgo",
],
)

bzl_library(
name = "asm",
srcs = ["asm.bzl"],
visibility = ["//go:__subpackages__"],
deps = ["@io_bazel_rules_go//go/private:mode"],
deps = ["//go/private:mode"],
)

bzl_library(
name = "binary",
srcs = ["binary.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"@io_bazel_rules_go//go/private:common",
"@io_bazel_rules_go//go/private:mode",
"//go/private:common",
"//go/private:mode",
],
)

bzl_library(
name = "compile",
srcs = ["compile.bzl"],
visibility = ["//go:__subpackages__"],
deps = ["@io_bazel_rules_go//go/private:mode"],
deps = ["//go/private:mode"],
)

bzl_library(
name = "compilepkg",
srcs = ["compilepkg.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"//go/private:mode",
"@bazel_skylib//lib:shell",
"@io_bazel_rules_go//go/private:mode",
],
)

Expand All @@ -65,8 +65,8 @@ bzl_library(
srcs = ["cover.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"//go/private:providers",
"@bazel_skylib//lib:structs",
"@io_bazel_rules_go//go/private:providers",
],
)

Expand All @@ -75,10 +75,10 @@ bzl_library(
srcs = ["link.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"//go/private:common",
"//go/private:mode",
"//go/private:rpath",
"@bazel_skylib//lib:collections",
"@io_bazel_rules_go//go/private:common",
"@io_bazel_rules_go//go/private:mode",
"@io_bazel_rules_go//go/private:rpath",
],
)

Expand All @@ -93,7 +93,7 @@ bzl_library(
srcs = ["stdlib.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"@io_bazel_rules_go//go/private:mode",
"@io_bazel_rules_go//go/private:providers",
"//go/private:mode",
"//go/private:providers",
],
)
2 changes: 1 addition & 1 deletion go/private/context.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ load(
"BuildSettingInfo",
)
load(
"@io_bazel_rules_go//go/private/rules:transition.bzl",
"//go/private/rules:transition.bzl",
"request_nogo_transition",
)

Expand Down
4 changes: 2 additions & 2 deletions go/private/nogo.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

DEFAULT_NOGO = "@io_bazel_rules_go//:default_nogo"
DEFAULT_NOGO = str(Label("//:default_nogo"))

def _go_register_nogo_impl(ctx):
ctx.template(
"BUILD.bazel",
Label("@io_bazel_rules_go//go/private:BUILD.nogo.bazel"),
Label("//go/private:BUILD.nogo.bazel"),
substitutions = {
"{{nogo}}": ctx.attr.nogo,
},
Expand Down
22 changes: 11 additions & 11 deletions go/private/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ def go_rules_dependencies():
# 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",
Label("//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",
Label("//third_party:org_golang_x_tools-gazelle.patch"),
],
patch_args = ["-p1"],
)
Expand All @@ -106,7 +106,7 @@ def go_rules_dependencies():
strip_prefix = "sys-2c5d950f24efcc95bc256be158532a2eee20542f",
patches = [
# releaser:patch-cmd gazelle -repo_root . -go_prefix golang.org/x/sys -go_naming_convention import_alias
"@io_bazel_rules_go//third_party:org_golang_x_sys-gazelle.patch",
Label("//third_party:org_golang_x_sys-gazelle.patch"),
],
patch_args = ["-p1"],
)
Expand All @@ -125,7 +125,7 @@ def go_rules_dependencies():
strip_prefix = "xerrors-5ec99f83aff198f5fbd629d6c8d8eb38a04218ca",
patches = [
# releaser:patch-cmd gazelle -repo_root . -go_prefix golang.org/x/xerrors -go_naming_convention import_alias
"@io_bazel_rules_go//third_party:org_golang_x_xerrors-gazelle.patch",
Label("//third_party:org_golang_x_xerrors-gazelle.patch"),
],
patch_args = ["-p1"],
)
Expand Down Expand Up @@ -160,7 +160,7 @@ def go_rules_dependencies():
strip_prefix = "protobuf-go-1.27.1",
patches = [
# releaser:patch-cmd gazelle -repo_root . -go_prefix google.golang.org/protobuf -go_naming_convention import_alias -proto disable_global
"@io_bazel_rules_go//third_party:org_golang_google_protobuf-gazelle.patch",
Label("//third_party:org_golang_google_protobuf-gazelle.patch"),
],
patch_args = ["-p1"],
)
Expand All @@ -183,7 +183,7 @@ def go_rules_dependencies():
strip_prefix = "protobuf-1.5.2",
patches = [
# releaser:patch-cmd gazelle -repo_root . -go_prefix github.com/golang/protobuf -go_naming_convention import_alias -proto disable_global
"@io_bazel_rules_go//third_party:com_github_golang_protobuf-gazelle.patch",
Label("//third_party:com_github_golang_protobuf-gazelle.patch"),
],
patch_args = ["-p1"],
)
Expand Down Expand Up @@ -217,7 +217,7 @@ def go_rules_dependencies():
strip_prefix = "protobuf-1.3.2",
patches = [
# releaser:patch-cmd gazelle -repo_root . -go_prefix github.com/gogo/protobuf -go_naming_convention import_alias -proto legacy
"@io_bazel_rules_go//third_party:com_github_gogo_protobuf-gazelle.patch",
Label("//third_party:com_github_gogo_protobuf-gazelle.patch"),
],
patch_args = ["-p1"],
)
Expand All @@ -244,7 +244,7 @@ def go_rules_dependencies():
strip_prefix = "go-genproto-c76a74d43a8eff9efc7832aa92c6a61ce42c8101",
patches = [
# releaser:patch-cmd gazelle -repo_root . -go_prefix google.golang.org/genproto -go_naming_convention import_alias -proto disable_global
"@io_bazel_rules_go//third_party:org_golang_google_genproto-gazelle.patch",
Label("//third_party:org_golang_google_genproto-gazelle.patch"),
],
patch_args = ["-p1"],
)
Expand All @@ -267,11 +267,11 @@ def go_rules_dependencies():
strip_prefix = "googleapis-409e134ffaacc243052b08e6fb8e2d458014ed37",
patches = [
# releaser:patch-cmd find . -name BUILD.bazel -delete
"@io_bazel_rules_go//third_party:go_googleapis-deletebuild.patch",
Label("//third_party:go_googleapis-deletebuild.patch"),
# set gazelle directives; change workspace name
"@io_bazel_rules_go//third_party:go_googleapis-directives.patch",
Label("//third_party:go_googleapis-directives.patch"),
# releaser:patch-cmd gazelle -repo_root .
"@io_bazel_rules_go//third_party:go_googleapis-gazelle.patch",
Label("//third_party:go_googleapis-gazelle.patch"),
],
patch_args = ["-E", "-p1"],
)
Expand Down
Loading