diff options
author | Florian Klink <flokli@flokli.de> | 2023-10-17T10·53+0100 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-10-17T19·51+0000 |
commit | e38733a955f6f6fc8962cf0e669d9cf4696bc14d (patch) | |
tree | 52dd4e750ab54870d782add53527f29fe5c2e3d2 /tvix/default.nix | |
parent | 0325ae3ba328ac7b4215057d2c00ac467dd9d820 (diff) |
chore(tvix): move castore golang bindings to tvix/castore-go r/6843
Have `tvix/castore/protos` only contain the protos, no go noise. Make the `.pb.go` file generation a pure Nix build at `//tvix/castore/protos:go-bindings`, and have a script at `//tvix:castore-go-generate` (TBD) that copies the results to `tvix/castore-go`. `//tvix:castore-go`, with sources in `tvix/castore-go` now contains the tooling around the generated bindings, and the generated bindings themselves (So go mod replace workflows still work). An additional CI step is added from there to ensure idempotenty of the .pb.go files. The code.tvl.fyi webserver config is updated to the new source code path. I'm still unsure if we want to also update the go.mod name. While being a backwards-incompatible change, it'll probbaly make it easier where to find these files, and the amount of external consumers is still low enough. Part of b/323. Change-Id: I2edadd118c22ec08e57c693f6cc2ef3261c62489 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9787 Reviewed-by: Connor Brewster <cbrewster@hey.com> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/default.nix')
-rw-r--r-- | tvix/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tvix/default.nix b/tvix/default.nix index dfb9f414373a..3365fe79812e 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -106,12 +106,10 @@ in # workspace too. shell = (import ./shell.nix { inherit pkgs; }); - # Builds and tests the code in castore/protos. - castore-protos-go = pkgs.buildGoModule { - name = "castore-golang"; - src = depot.third_party.gitignoreSource ./castore/protos; - vendorHash = "sha256-ZNtSSW+oCxMsBtURSrea9/GyUHDagtGefM+Ii+VkgCA="; - }; + # Update `.pb.go` files in tvix/castore-go with the generated ones. + castore-go-generate = pkgs.writeShellScriptBin "castore-go-protogen" '' + (cd $(git rev-parse --show-toplevel)/tvix/castore-go && rm *.pb.go && cp ${depot.tvix.castore.protos.go-bindings}/*.pb.go . && chmod +w *.pb.go) + ''; # Builds and tests the code in store/protos. store-protos-go = pkgs.buildGoModule { @@ -146,7 +144,6 @@ in }; meta.ci.targets = [ - "castore-protos-go" "store-protos-go" "shell" "rust-docs" |