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

bzlmod: Use repo_name attribute on module instead of patches #3279

Merged
merged 1 commit into from
Sep 5, 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
3 changes: 0 additions & 3 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ tasks:
name: BCR test module
platform: ubuntu2004
bazel: last_green
shell_commands:
# Patch io_bazel_rules_go to rules_go.
- "patch -p1 -d ../.. <bcr.patch"
working_directory: tests/bcr
build_flags:
- "--experimental_enable_bzlmod"
Expand Down
3 changes: 2 additions & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module(
name = "io_bazel_rules_go",
name = "rules_go",
repo_name = "io_bazel_rules_go",
version = "0.33.0",
compatibility_level = 0,
toolchains_to_register = [
Expand Down
4 changes: 2 additions & 2 deletions tests/bcr/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module(
# Test that the default SDK is registered by not registering one from the test module.
)

bazel_dep(name = "io_bazel_rules_go", version = "", repo_name = "my_rules_go")
bazel_dep(name = "rules_go", version = "", repo_name = "my_rules_go")
local_path_override(
module_name = "io_bazel_rules_go",
module_name = "rules_go",
path = "../..",
)

Expand Down
190 changes: 0 additions & 190 deletions tests/bcr/bcr.patch

This file was deleted.