mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: move protoCheck into extraStep of //nix/bufCheck

Browse source 
Resolves b/385. I have a feeling bufCheck should be moved to
//tools as well.

Change-Id: I2a2b63d135a2f8bcc982aa1138ff3213c6012f20
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11152
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
sterni 2024-03-14 23:13:01 +01:00 committed by clbot
parent 5fccbe5939
commit d5b6704d3d
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
nix/bufCheck/default.nix
View file

@ -1,9 +1,26 @@
# Check protobuf breaking. Lints already happen in individual targets.
#
{ depot, pkgs, ... }:
{ depot, pkgs, lib, ... }:
pkgs.writeShellScriptBin "ci-buf-check" ''
export PATH="$PATH:${pkgs.lib.makeBinPath [ pkgs.buf ]}"
# Report-only
(cd $(git rev-parse --show-toplevel) && (buf breaking . --against "./.git#ref=HEAD~1" || true))
''
let
inherit (depot.nix) bufCheck;# self reference
script = pkgs.writeShellScriptBin "ci-buf-check" ''
export PATH="$PATH:${pkgs.lib.makeBinPath [ pkgs.buf ]}"
# Report-only
(cd $(git rev-parse --show-toplevel) && (buf breaking . --against "./.git#ref=HEAD~1" || true))
'';
in
script.overrideAttrs (old: {
meta = lib.recursiveUpdate old.meta {
# Protobuf check step executed in the buildkite pipeline which
# validates that changes to .proto files between revisions
# don't cause backwards-incompatible or otherwise flawed changes.
ci.extraSteps.protoCheck = {
alwaysRun = true;
label = ":water_buffalo: protoCheck";
command = pkgs.writeShellScript "ci-buf-check-step" "exec ${depot.nix.bufCheck}/bin/ci-buf-check";
};
};
})

9
ops/pipelines/depot.nix
View file

@ -3,18 +3,9 @@
{ depot, pkgs, externalArgs, ... }:
let
# Protobuf check step which validates that changes to .proto files
# between revisions don't cause backwards-incompatible or otherwise
# flawed changes.
protoCheck = {
command = "${depot.nix.bufCheck}/bin/ci-buf-check";
label = ":water_buffalo: protoCheck";
};
pipeline = depot.nix.buildkite.mkPipeline {
headBranch = "refs/heads/canon";
drvTargets = depot.ci.targets;
additionalSteps = [ protoCheck ];
parentTargetMap =
if (externalArgs ? parentTargetMap)