From df4f3d046cffe23a7ac042cf3f424b8f4d7dbe1e Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Tue, 15 Sep 2020 09:10:03 +1000 Subject: [PATCH 1/2] Include hydra evaluation in bors.toml --- bors.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bors.toml b/bors.toml index b3ab02ef..caaf94e4 100644 --- a/bors.toml +++ b/bors.toml @@ -1,6 +1,7 @@ status = [ "buildkite/cardano-benchmarking", - "ci/hydra:Cardano:cardano-benchmarking:required", + "ci/hydra-eval", + "ci/hydra-build:required", ] timeout_sec = 7200 required_approvals = 1 From 596bd8fc64f7ca1356a20fb6b13e10f4e31eb0d3 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Tue, 15 Sep 2020 09:10:42 +1000 Subject: [PATCH 2/2] nix: Fix eval of macos release job --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index a2389254..e43c0651 100644 --- a/default.nix +++ b/default.nix @@ -22,7 +22,7 @@ let (cardanoBenchmarkingHaskellPackages.projectPackages); self = { - inherit haskellPackages cardanoNode; + inherit haskellPackages cardanoNode pkgs; # Grab the executable component of our package. inherit (haskellPackages.cardano-tx-generator.components.exes)