diff --git a/buildkite-cd.yaml b/buildkite-cd.yaml index fe2dace..1229419 100644 --- a/buildkite-cd.yaml +++ b/buildkite-cd.yaml @@ -1,7 +1,8 @@ +agents: + queue: private + steps: - label: build - agents: - queue: private artifacts: - alejandra-* command: @@ -16,8 +17,6 @@ steps: - cp -L result/* . - label: coverage - agents: - queue: private command: - echo +++ Fetch - git branch -D main diff --git a/buildkite-ci.yaml b/buildkite-ci.yaml index 2fe89ed..0ed3809 100644 --- a/buildkite-ci.yaml +++ b/buildkite-ci.yaml @@ -13,14 +13,14 @@ steps: - git clone --branch=master --depth 1 --origin=upstream file:///data/nixpkgs - echo --- Formatting - before - - nix --tarball-ttl 1 run github:kamadorueda/alejandra -- nixpkgs 2>/dev/null + - nix run github:kamadorueda/alejandra -- --quiet nixpkgs - git -C nixpkgs add . - git -C nixpkgs commit -m formatting-before -q - git -C nixpkgs branch formatting-before - git -C nixpkgs reset --hard master~1 - echo --- Formatting - after - - nix run . -- nixpkgs 2>/dev/null + - nix run . -- --quiet nixpkgs - git -C nixpkgs diff formatting-before > formatting-before-vs-after.patch.txt - label: closure diff @@ -38,7 +38,7 @@ steps: - nix-env --query --available --attr-path --drv-path --file nixpkgs --xml > closure-before.txt - echo --- Formatting - - nix run . -- nixpkgs 2>/dev/null + - nix run . -- --quiet nixpkgs - echo --- Closure @ after - nix-env --query --available --attr-path --drv-path --file nixpkgs --xml > closure-after.txt diff --git a/buildkite.yaml b/buildkite.yaml new file mode 100644 index 0000000..7a0749e --- /dev/null +++ b/buildkite.yaml @@ -0,0 +1,6 @@ +steps: + - if: build.branch == "main" + command: buildkite-agent pipeline upload buildkite-cd.yaml + + - if: build.branch != "main" + command: buildkite-agent pipeline upload buildkite-ci.yaml