Merge pull request #56 from Liqwid-Labs/emiflake/hercules

Hercules configuration support

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This format is based on [Keep A Changelog](https://keepachangelog.com/en/1.0.0).
 
+## 2.7.2 - 2023-03-22
+
+- Enable Hercules CI support.
+
 ## 2.7.1 - 2023-03-17
 
 - Remove uses of `ifEnable`.

flake.nix

@@ -29,7 +29,7 @@
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
   };
 
-  outputs = inputs@{ flake-parts, ... }:
+  outputs = inputs@{ self, flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
         ./nix/templates.nix
@@ -66,18 +66,10 @@
               find -name '*.nix' -not -path './dist*/*' -not -path './haddock/*' | xargs nixpkgs-fmt
             '';
         };
-      flake = { self, ... }: {
-        config.hydraJobs = {
-          packages = self.packages.x86_64-linux;
-          checks = self.checks.x86_64-linux;
-          devShells = self.devShells.x86_64-linux;
-        };
-        config.herculesCI = { ... }: {
-          onPush.default = {
-            outputs = { ... }:
-              self.checks.x86_64-linux;
-          };
+      flake = { ... }: {
+        config.herculesCI = {
           ciSystems = [ "x86_64-linux" ];
+          onPush.default.outputs = self.checks.x86_64-linux;
         };
       };
     };

nix/all-modules.nix

@@ -5,7 +5,7 @@ let
     onchain = ./onchain.nix;
     offchain = ./offchain.nix;
     run = ./run.nix;
-    ci = ./ci.nix;
+    ci = ./ci-config.nix;
   };
 in
 {

nix/ci.nix → nix/ci-config.nix

@@ -67,6 +67,17 @@ in
       );
   };
   config = {
+    # NOTE(Emily, 22 Mar 2023): Here we provide sensible defaults for working with liqwid-nix. 
+    # These can be overwritten by the user, though. In the future, we may want some out-of-the-
+    # -box implementation for enabling this somehow.
+    flake = { ... }: {
+      # Added in: 2.7.2.
+      config.herculesCI = {
+        ciSystems = [ "x86_64-linux" ];
+        onPush.default.outputs = self.checks.x86_64-linux;
+        onPush.required.outputs = self.checks.x86_64-linux.required;
+      };
+    };
     perSystem = { config, self', inputs', pkgs, system, ... }:
       let
         pkgs = import self.inputs.nixpkgs {