diff options
| author | Florian Klink <flokli@flokli.de> | 2023-12-09T13·40+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-12-11T22·35+0000 |
| commit | 43943e26230562fcf3a6dc516f2c389f768f20fe (patch) | |
| tree | 9ec4b89225f37e54f314cad16fc2bddd16ae5d52 /tvix/build | |
| parent | 8486f87e3c180732d04e58154762c016c054d776 (diff) | |
refactor(tvix/*/protos): separate lint target r/7155
Break up the go-bindings derivation. Keep "protos" containing all proto files (well, and the buf config), and use it for a check phase running linter and formatter, as well as the existing "go-bindings" attribute Change-Id: I52cb9d08570bb76452acb831eb711c5b6c0eacfb Reviewed-on: https://cl.tvl.fyi/c/depot/+/10239 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/build')
| -rw-r--r-- | tvix/build/protos/default.nix | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/tvix/build/protos/default.nix b/tvix/build/protos/default.nix index 138bc2fb71..790655ac75 100644 --- a/tvix/build/protos/default.nix +++ b/tvix/build/protos/default.nix @@ -1,20 +1,43 @@ -{ depot, pkgs, ... }: { +{ depot, pkgs, ... }: +let + protos = depot.nix.sparseTree { + name = "build-protos"; + root = depot.path.origSrc; + paths = [ + # We need to include castore.proto (only), as it's referred. + ../../castore/protos/castore.proto + ./build.proto + ./rpc_build.proto + ../../../buf.yaml + ../../../buf.gen.yaml + ]; + }; +in +depot.nix.readTree.drvTargets { + inherit protos; + + # Lints and ensures formatting of the proto files. + check = pkgs.stdenv.mkDerivation { + name = "proto-check"; + src = protos; + + nativeBuildInputs = [ + pkgs.buf + ]; + + buildPhase = '' + export HOME=$TMPDIR + buf lint + buf format -d --exit-code + touch $out + ''; + }; + # Produces the golang bindings. go-bindings = pkgs.stdenv.mkDerivation { name = "go-bindings"; - src = depot.nix.sparseTree { - name = "build-protos"; - root = depot.path.origSrc; - paths = [ - # We need to include castore.proto (only), as it's referred. - ../../castore/protos/castore.proto - ./build.proto - ./rpc_build.proto - ../../../buf.yaml - ../../../buf.gen.yaml - ]; - }; + src = protos; nativeBuildInputs = [ pkgs.buf @@ -24,8 +47,6 @@ buildPhase = '' export HOME=$TMPDIR - buf lint - buf format -d --exit-code buf generate mkdir -p $out |