Merge branch 'master' into noinfo

Author: aiuto

.bazelci/presubmit.yml

@@ -3,15 +3,21 @@ buildifier:
   version: latest
   warnings: "default"
 platforms:
-  ubuntu1604:
+  ubuntu1804:
     test_targets:
     - "//..."
-  ubuntu1804:
+  ubuntu2004:
+    test_targets:
+    - "//..."
+  ubuntu2204:
     test_targets:
     - "//..."
   macos:
     test_targets:
     - "//..."
+  macos_arm64:
+    test_targets:
+    - "//..."
   windows:
     test_flags:
     - "--enable_runfiles"

.bazelrc

@@ -8,3 +8,10 @@ build:release -c opt --stamp --workspace_status_command="$PWD/status.py"
 # *last* statement in the root configuration file, as the local configuration
 # file should be able to overwrite flags from the root configuration.
 try-import %workspace%/.bazelrc.user
+
+# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
+# https://github.com/bazelbuild/buildtools/issues/1204
+common --noenable_bzlmod
+
+build --cxxopt=-std=c++14
+build --host_cxxopt=-std=c++14

.pre-commit-config.yaml

@@ -0,0 +1,13 @@
+# First [install pre-commit](https://pre-commit.com/#installation),
+# then run
+# pre-commit install
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+
+repos:
+    # Check formatting and lint for starlark code
+    - repo: https://github.com/keith/pre-commit-buildifier
+      rev: 6.3.3
+      hooks:
+          - id: buildifier
+          - id: buildifier-lint

BUILD.bazel

@@ -21,21 +21,22 @@ test_suite(
     name = "tests",
     tests = [
         "//api_proto:api.gen.pb.go_checkshtest",
-        "//build:go_default_test",
+        "//build:build_test",
         "//build_proto:build.gen.pb.go_checkshtest",
         "//buildifier:buildifier_integration_test",
         "//deps_proto:deps.gen.pb.go_checkshtest",
-        "//edit:go_default_test",
+        "//edit:edit_test",
         "//extra_actions_base_proto:extra_actions_base.gen.pb.go_checkshtest",
-        "//labels:go_default_test",
+        "//labels:labels_test",
         "//lang:tables.gen.go_checkshtest",
-        "//tables:go_default_test",
-        "//warn:go_default_test",
-        "//warn/docs:go_default_test",
-        "//wspace:go_default_test",
+        "//tables:tables_test",
+        "//warn:warn_test",
+        "//warn/docs:docs_test",
+        "//wspace:wspace_test",
     ],
 )
 
+#gazelle:go_naming_convention import_alias
 gazelle(
     name = "gazelle",
     prefix = "github.com/bazelbuild/buildtools",

CODEOWNERS

@@ -1,2 +1,2 @@
 # Admins
-* @vladmos @pmbethe09 @meisterT
+* @vladmos @pmbethe09 @larsrc-google

MODULE.bazel

@@ -0,0 +1,2 @@
+# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
+# https://github.com/bazelbuild/buildtools/issues/1204

WARNINGS.md

@@ -765,7 +765,6 @@ The statement has no effect. Consider removing it or storing its result in a var
 
   * Category name: `out-of-order-load`
   * Automatic fix: yes
-  * [Disabled by default](buildifier/README.md#linter)
   * [Suppress the warning](#suppress): `# buildifier: disable=out-of-order-load`
 
 Load statements should be ordered by their first argument - extension file label.

WORKSPACE

@@ -39,10 +39,10 @@ go_repository(
 
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
-    strip_prefix = "protobuf-3.13.0",
+    sha256 = "616bb3536ac1fff3fb1a141450fa28b875e985712170ea7f1bfe5e5fc41e2cd8",
+    strip_prefix = "protobuf-24.4",
     urls = [
-        "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
+        "https://github.com/protocolbuffers/protobuf/archive/v24.4.tar.gz",
     ],
 )
 
@@ -76,20 +76,37 @@ load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_depen
 
 buildifier_dependencies()
 
-# We don't use any nodejs but this includes a rule for publishing releases to npm
 http_archive(
-    name = "build_bazel_rules_nodejs",
-    sha256 = "8a7c981217239085f78acc9898a1f7ba99af887c1996ceb3b4504655383a2c3c",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.0.0/rules_nodejs-4.0.0.tar.gz"],
+    name = "rules_nodejs",
+    sha256 = "162f4adfd719ba42b8a6f16030a20f434dc110c65dc608660ef7b3411c9873f9",
+    strip_prefix = "rules_nodejs-6.0.2",
+    url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.0.2/rules_nodejs-v6.0.2.tar.gz",
 )
 
-load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "npm_install")
+load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
 
-node_repositories(node_version = "16.7.0")
+nodejs_register_toolchains(
+    name = "nodejs",
+    node_version = "16.7.0",
+)
 
-# Fetch third-party dependencies for building npm packages
-npm_install(
-    name = "buildozer_npm_deps",
-    package_json = "//buildozer/npm:package.json",
-    package_lock_json = "//buildozer/npm:package-lock.json",
+http_archive(
+    name = "aspect_rules_js",
+    sha256 = "7ab9776bcca823af361577a1a2ebb9a30d2eb5b94ecc964b8be360f443f714b2",
+    strip_prefix = "rules_js-1.32.6",
+    url = "https://github.com/aspect-build/rules_js/releases/download/v1.32.6/rules_js-v1.32.6.tar.gz",
 )
+
+load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
+
+rules_js_dependencies()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+load("@aspect_bazel_lib//lib:repositories.bzl", "register_copy_to_directory_toolchains", "register_jq_toolchains")
+
+register_jq_toolchains()
+
+register_copy_to_directory_toolchains()

api_proto/BUILD.bazel

@@ -23,8 +23,14 @@ go_proto_library(
 )
 
 go_library(
-    name = "go_default_library",
+    name = "api_proto",
     embed = [":api_proto_go_proto"],
     importpath = "github.com/bazelbuild/buildtools/api_proto",
     visibility = ["//visibility:public"],
 )
+
+alias(
+    name = "go_default_library",
+    actual = ":api_proto",
+    visibility = ["//visibility:public"],
+)

api_proto/api.gen.pb.go

@@ -34,6 +34,7 @@ message Output {
       enum ERROR {
         UNKNOWN = 0;
         MISSING = 1;
+        MISSING_LIST_ITEM = 2;
       }
     }
   }

api_proto/api.proto

@@ -8,7 +8,7 @@ go_yacc(
 )
 
 go_library(
-    name = "go_default_library",
+    name = "build",
     srcs = [
         "lex.go",
         "parse.y.baz.go",  # keep
@@ -23,12 +23,12 @@ go_library(
     importpath = "github.com/bazelbuild/buildtools/build",
     visibility = ["//visibility:public"],
     deps = [
-        "//tables:go_default_library",
+        "//tables",
     ],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "build_test",
     size = "small",
     srcs = [
         "checkfile_test.go",
@@ -49,9 +49,15 @@ go_test(
         "rewrite_test_files/original_formatted.star",
         "rewrite_test_files/original.star",
     ],
-    embed = [":go_default_library"],
+    embed = [":build"],
     deps = [
-        "//tables:go_default_library",
+        "//tables",
         "//testutils",
     ],
 )
+
+alias(
+    name = "go_default_library",
+    actual = ":build",
+    visibility = ["//visibility:public"],
+)

build/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//build:build_defs.bzl", "go_proto_checkedin_test")
@@ -18,8 +19,21 @@ proto_library(
 )
 
 go_proto_library(
-    name = "go_default_library",
+    name = "build_proto_go_proto",
     importpath = "github.com/bazelbuild/buildtools/build_proto",
     proto = ":blaze_query_proto",
     visibility = ["//visibility:public"],
 )
+
+go_library(
+    name = "build_proto",
+    embed = [":build_proto_go_proto"],
+    importpath = "github.com/bazelbuild/buildtools/build_proto",
+    visibility = ["//visibility:public"],
+)
+
+alias(
+    name = "go_default_library",
+    actual = ":build_proto",
+    visibility = ["//visibility:public"],
+)