Remove Bazel WORKSPACE setup.

google · Jan 24, 2025 · 3b0053f · 3b0053f
1 parent 65e49fa
commit 3b0053f
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 324 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -2,7 +2,6 @@
 buildifier: latest
 matrix:
   bazel:
-    - 6.x
     - 7.x
     - 8.x
 tasks:

diff --git a/BUILD.bazel b/BUILD.bazel
@@ -32,7 +32,6 @@ filegroup(
         ".npmrc",
         "BUILD.bazel",
         "MODULE.bazel",
-        "WORKSPACE",
         "build_defs.bzl",
         "package.json",
         "pnpm-lock.yaml",

diff --git a/WORKSPACE b/WORKSPACE
diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
diff --git a/build_defs.bzl b/build_defs.bzl
@@ -7,27 +7,21 @@ Rules for building C++ flatbuffers with Bazel.
 
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
-def repo_name(label):
-    if hasattr(label, "repo_name"):  # Added in Bazel 7.1
-        return label.repo_name
-    else:
-        return "com_github_google_flatbuffers"
-
 TRUE_FLATC_PATH = Label("//:flatc")
 
 DEFAULT_INCLUDE_PATHS = [
     "./",
     "$(GENDIR)",
     "$(BINDIR)",
-    "$(execpath %s).runfiles/%s" % (TRUE_FLATC_PATH, repo_name(TRUE_FLATC_PATH)),
+    "$(execpath %s).runfiles/%s" % (TRUE_FLATC_PATH, TRUE_FLATC_PATH.repo_name),
 ]
 
 def default_include_paths(flatc_path):
     return [
         "./",
         "$(GENDIR)",
         "$(BINDIR)",
-        "$(execpath %s).runfiles/%s" % (flatc_path, repo_name(flatc_path)),
+        "$(execpath %s).runfiles/%s" % (flatc_path, flatc_path.repo_name),
     ]
 
 DEFAULT_FLATC_ARGS = [

diff --git a/tests/bazel_repository_test_dir/README.md b/tests/bazel_repository_test_dir/README.md
@@ -1,8 +1,3 @@
 This directory is not intended to be used independently of the flatbuffers
 repository. Instead, this whole directory serves as a unit test for the
 C++ integration in the flatbuffers repo.
-
-Run this test from the top-level of the flatbuffers repo.
-```console
-$ bazel test //tests:bazel_repository_test
-```
diff --git a/tests/bazel_repository_test_dir/WORKSPACE b/tests/bazel_repository_test_dir/WORKSPACE
diff --git a/tests/bazel_repository_test_dir/WORKSPACE.bzlmod b/tests/bazel_repository_test_dir/WORKSPACE.bzlmod
diff --git a/tests/ts/bazel_repository_test_dir/WORKSPACE b/tests/ts/bazel_repository_test_dir/WORKSPACE
diff --git a/tests/ts/bazel_repository_test_dir/WORKSPACE.bzlmod b/tests/ts/bazel_repository_test_dir/WORKSPACE.bzlmod
diff --git a/ts/BUILD.bazel b/ts/BUILD.bazel
@@ -8,7 +8,6 @@ filegroup(
         "BUILD.bazel",
         "compile_flat_file.sh",
         "pnpm-lock.yaml",
-        "repositories.bzl",
     ] + glob([
         "*.ts",
     ]),

diff --git a/ts/repositories.bzl b/ts/repositories.bzl
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     buildifier: latest
     matrix:
       bazel:
-        - 6.x
         - 7.x
         - 8.x
     tasks:
@@ Expand Down @@