diff options
| -rw-r--r-- | buf.gen.yaml | 1 | ||||
| -rw-r--r-- | buf.yaml | 11 | ||||
| -rw-r--r-- | nix/bufCheck/default.nix | 4 | ||||
| -rw-r--r-- | third_party/bufbuild/default.nix | 29 | ||||
| -rw-r--r-- | tools/depot-scanner/depot_scanner.proto | 6 |
5 files changed, 14 insertions, 37 deletions
diff --git a/buf.gen.yaml b/buf.gen.yaml new file mode 100644 index 000000000000..c126332f3080 --- /dev/null +++ b/buf.gen.yaml @@ -0,0 +1 @@ +version: v1 diff --git a/buf.yaml b/buf.yaml index 42c769f2e4fd..ab2028f40e07 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,13 +1,12 @@ -build: - roots: - #- proto - - third_party +version: v1 + lint: - ignore: - - nix/buildGo + allow_comment_ignores: true use: - BASIC - FILE_LOWER_SNAKE_CASE except: - ENUM_VALUE_UPPER_SNAKE_CASE - PACKAGE_DIRECTORY_MATCH + ignore: + - nix/buildGo diff --git a/nix/bufCheck/default.nix b/nix/bufCheck/default.nix index 039303ba684b..25a8865d8dcf 100644 --- a/nix/bufCheck/default.nix +++ b/nix/bufCheck/default.nix @@ -3,7 +3,7 @@ { depot, pkgs, ... }: pkgs.writeShellScriptBin "ci-buf-check" '' - ${depot.third_party.bufbuild}/bin/buf check lint --input . + ${depot.third_party.nixpkgs.buf}/bin/buf lint . # Report-only - ${depot.third_party.bufbuild}/bin/buf check breaking --input "." --against-input "./.git#branch=canon" || true + ${depot.third_party.nixpkgs.buf}/bin/buf breaking . --against "./.git#ref=HEAD~1" || true '' diff --git a/third_party/bufbuild/default.nix b/third_party/bufbuild/default.nix deleted file mode 100644 index 38d84b24bcb4..000000000000 --- a/third_party/bufbuild/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -# buf.build is a Protobuf linter and breaking change detector. -# Several binaries are produced. -{ pkgs, lib, ... }: - -pkgs.buildGoModule { - pname = "buf"; - version = "v0.20.1"; - vendorHash = "sha256:1gg5c7aiqb4w1zxwsraxxpln33xkmkzlp1h69xgi9i08zvrfipqs"; - - src = pkgs.fetchFromGitHub { - owner = "bufbuild"; - repo = "buf"; - rev = "5e8bf4c800de911764ffdf8d2188b7f6f54476e4"; - sha256 = "1rni5swfnb4sbrd9rls4mc3902xhqrlsja96lfcdfjzx08g6kg20"; - }; - - doCheck = false; - - # TODO(riking): postinstall produce shell completions for bash, fish, zsh - # bin/buf bash-completion - # bin/buf zsh-completion - # # bin/buf manpages # not yet functional - - meta = with lib; { - description = "Protobuf linter and breaking change detector"; - homepage = "https://buf.build/docs/introduction"; - license = licenses.asl20; - }; -} diff --git a/tools/depot-scanner/depot_scanner.proto b/tools/depot-scanner/depot_scanner.proto index 5249daebf495..ecb5b1cb3335 100644 --- a/tools/depot-scanner/depot_scanner.proto +++ b/tools/depot-scanner/depot_scanner.proto @@ -18,19 +18,25 @@ message ScanRequest { string attr = 2; // Optionally, the attr to evaluate can be provided as a path to a folder or a // .nix file. This is used by the HTTP service. + // buf:lint:ignore FIELD_LOWER_SNAKE_CASE string attrAsPath = 3; } message ScanResponse { + // buf:lint:ignore FIELD_LOWER_SNAKE_CASE repeated string depotPath = 1; + // buf:lint:ignore FIELD_LOWER_SNAKE_CASE repeated string nixStorePath = 2; + // buf:lint:ignore FIELD_LOWER_SNAKE_CASE repeated string corePkgsPath = 4; + // buf:lint:ignore FIELD_LOWER_SNAKE_CASE repeated string otherPath = 3; bytes derivation = 5; } message ArchiveRequest { + // buf:lint:ignore FIELD_LOWER_SNAKE_CASE repeated string depotPath = 1; } |