Update to use Bazel 7.4.1. (#5071)

This specifically enables the legacy WORKSPACE-based resolution, and disables the new bzlmod-based resolution. Related to #5065 and #5066. --------- Signed-off-by: John Cater <[email protected]>
p4lang · Dec 17, 2024 · 6b9de96 · 6b9de96
1 parent 3f3365d
commit 6b9de96
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1 +1,6 @@
+# Remove once #5066 is resolved.
+common --enable_workspace
+# Enable once #5066 is resolved.
+common --noenable_bzlmod
+
 build --action_env=BAZEL_CXXOPTS="-std=c++17"
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.4.0
+7.4.1
diff --git a/bazel/example/.bazelrc b/bazel/example/.bazelrc
@@ -1 +1,6 @@
+# Remove once #5066 is resolved.
+common --enable_workspace
+# Enable once #5066 is resolved.
+common --noenable_bzlmod
+
 build --action_env=BAZEL_CXXOPTS="-std=c++17"
diff --git a/bazel/example/.bazelversion b/bazel/example/.bazelversion
@@ -1 +1 @@
-6.4.0
+7.4.1
diff --git a/bazel/example/WORKSPACE.bazel b/bazel/example/WORKSPACE.bazel
@@ -7,7 +7,8 @@ local_repository(
     # This part is optional: only needed for custom backends with IR extensions.
     repo_mapping = {
         # Tells p4c where to look for `:ir_extension` target: in this project.
-        "@com_github_p4lang_p4c_extension": "@example_p4_project",
+        # The main repo has no name, so a bare `@` means this repository.
+        "@com_github_p4lang_p4c_extension": "@",
     },
 )