From 147b4f09b6e540088f49f9b0ecfc046641adeab4 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.Mackenzie@iohk.io>
Date: Wed, 6 Jan 2021 15:57:06 +1300
Subject: [PATCH] Try https://github.com/NixOS/hydra/issues/715

---
 bors.toml   | 18 +-----------------
 release.nix |  9 ++++++++-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/bors.toml b/bors.toml
index c3a7beadd5..c2c2cd2e08 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,22 +1,6 @@
 status = [
   "buildkite/haskell-dot-nix",
-  # Generasted in `nix repl` with
-  # __trace (builtins.concatStringsSep "\n" (builtins.map (n: "  \"ci/hydra:Cardano:haskell-nix:${n}\",") (builtins.attrNames (import ./release.nix {})))) {}
-  # TODO automate updating
-  "ci/hydra:Cardano:haskell-nix:required-R2003-ghc865-darwin",
-  "ci/hydra:Cardano:haskell-nix:required-R2003-ghc865-linux",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc8101-darwin",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc8101-linux",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc8102-darwin",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc8102-linux",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc810220201118-darwin",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc810220201118-linux",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc865-darwin",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc865-linux",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc883-darwin",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc883-linux",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc884-darwin",
-  "ci/hydra:Cardano:haskell-nix:required-R2009-ghc884-linux",
+  "ci/hydra:Cardano:haskell-nix:required",
 ]
 timeout_sec = 7200
 required_approvals = 1
diff --git a/release.nix b/release.nix
index 1ea5a9e068..085e4c7966 100644
--- a/release.nix
+++ b/release.nix
@@ -36,6 +36,13 @@ let
           }) (names ghcJobs)
         ) (names nixpkgsJobs)
       ) (names allJobs));
-in latestJobs // requiredJobs
+in latestJobs // requiredJobs // {
+    required = genericPkgs.releaseTools.aggregate {
+      name = "haskell.nix-required";
+      meta.description = "All jobs required to pass CI";
+      # Using the names here requires https://github.com/NixOS/hydra/issues/715
+      constituents = builtins.attrNames requiredJobs;
+    };
+ }