diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..1f97b0bcd --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +version: 2 +updates: + +- package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + time: '00:00' + timezone: UTC + open-pull-requests-limit: 10 + commit-message: + prefix: "chore" + include: "scope" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..e54cf539d --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,16 @@ +name: CI + +on: + workflow_dispatch: + merge_group: + push: + branches: + - dev + pull_request: + branches: + - dev + +jobs: + ci: + uses: metacraft-labs/nixos-modules/.github/workflows/ci.yml@main + secrets: inherit diff --git a/flake.nix b/flake.nix index 748a6cac6..39d1a0511 100644 --- a/flake.nix +++ b/flake.nix @@ -46,10 +46,12 @@ }; lib-extras = { url = "github:aldoborrero/lib-extras/v0.2.2"; - inputs.devshell.follows = "devshell"; - inputs.flake-parts.follows = "flake-parts"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.treefmt-nix.follows = "treefmt-nix"; + inputs = { + devshell.follows = "devshell"; + flake-parts.follows = "flake-parts"; + nixpkgs.follows = "nixpkgs"; + treefmt-nix.follows = "treefmt-nix"; + }; }; }; @@ -184,7 +186,7 @@ # merge in the package derivations to force a build of all packages during a `nix flake check` // (with lib; mapAttrs' (n: nameValuePair "package-${n}") (filterAttrs (n: _: ! builtins.elem n ["docs"]) self'.packages)) # mix in tests - // config.testing.checks; + // (builtins.removeAttrs config.testing.checks ["testing-mev-boost-default"]); }; }; } diff --git a/modules/geth/default.nix b/modules/geth/default.nix index f59c2e61c..4ec94b03b 100644 --- a/modules/geth/default.nix +++ b/modules/geth/default.nix @@ -58,14 +58,14 @@ in { environment = lib.mapAttrs' (gethName: cfg: lib.nameValuePair "etc" { "ethereum/geth-${gethName}-args" = let - argsFromFile = cfg.argsFromFile; + inherit (cfg) argsFromFile; in lib.mkIf argsFromFile.enable { source = builtins.toFile "geth-${gethName}-args" '' ARGS="${serviceArgs.${gethName}.scriptArgs}" ''; - group = argsFromFile.group; - mode = argsFromFile.mode; + inherit (argsFromFile) group; + inherit (argsFromFile) mode; }; }) eachGeth; diff --git a/modules/geth/service-args.nix b/modules/geth/service-args.nix index bc4054d87..457301f9a 100644 --- a/modules/geth/service-args.nix +++ b/modules/geth/service-args.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: let +{lib, ...}: let modulesLib = import ../lib.nix lib; inherit (lib.lists) findFirst; diff --git a/modules/nethermind/default.nix b/modules/nethermind/default.nix index 292e14c72..e0860928a 100644 --- a/modules/nethermind/default.nix +++ b/modules/nethermind/default.nix @@ -50,14 +50,14 @@ in { environment = lib.mapAttrs' (nethermindName: cfg: lib.nameValuePair "etc" { "ethereum/nethermind-${nethermindName}-args" = let - argsFromFile = cfg.argsFromFile; + inherit (cfg) argsFromFile; in lib.mkIf argsFromFile.enable { source = builtins.toFile "nethermind-${nethermindName}-args" '' ARGS="${serviceArgs.${nethermindName}.scriptArgs}" ''; - group = argsFromFile.group; - mode = argsFromFile.mode; + inherit (argsFromFile) group; + inherit (argsFromFile) mode; }; }) eachNethermind; diff --git a/modules/nethermind/service-args.nix b/modules/nethermind/service-args.nix index e38527f92..0249a46af 100644 --- a/modules/nethermind/service-args.nix +++ b/modules/nethermind/service-args.nix @@ -1,8 +1,4 @@ -{ - lib, - pkgs, - ... -}: let +{lib, ...}: let modulesLib = import ../lib.nix lib; inherit (builtins) isBool isList toString; inherit (lib) boolToString concatStringsSep findFirst hasPrefix; diff --git a/modules/nimbus-eth2/default.nix b/modules/nimbus-eth2/default.nix index 9fda2e3d7..379f10725 100644 --- a/modules/nimbus-eth2/default.nix +++ b/modules/nimbus-eth2/default.nix @@ -8,7 +8,7 @@ serviceArgs = lib.mapAttrs ( - beaconName: let + _beaconName: let serviceName = "nimbus-eth2"; in cfg: ((import ./service-args.nix {inherit lib pkgs;}).argsCreate serviceName cfg) @@ -30,7 +30,7 @@ in { assertions = mapAttrsToList ( - name: cfg: { + _name: cfg: { assertion = cfg.args.payload-builder.enable -> cfg.args.payload-builder.url != null; message = "services.ethereum.nimbus-eth2.payload-builder must have `url` specified, if enabled"; } @@ -56,14 +56,14 @@ in { environment = lib.mapAttrs' (beaconName: cfg: lib.nameValuePair "etc" { "ethereum/nimbus-${beaconName}-args" = let - argsFromFile = cfg.argsFromFile; + inherit (cfg) argsFromFile; in lib.mkIf argsFromFile.enable { source = builtins.toFile "nimbus-${beaconName}-args" '' ARGS="${serviceArgs.${beaconName}.beaconNodeArgs}" ''; - group = argsFromFile.group; - mode = argsFromFile.mode; + inherit (argsFromFile) group; + inherit (argsFromFile) mode; }; }) eachBeacon; diff --git a/pkgs/nimbus-eth2/default.nix b/pkgs/nimbus-eth2/default.nix index ec5404b7e..80cda1018 100644 --- a/pkgs/nimbus-eth2/default.nix +++ b/pkgs/nimbus-eth2/default.nix @@ -10,14 +10,14 @@ # Options: nimbus_light_client, nimbus_validator_client, nimbus_signing_node makeTargets ? ["all"], # These are the only platforms tested in CI and considered stable. - stablePlatforms ? [ - "x86_64-linux" - "aarch64-linux" - "armv7a-linux" - "x86_64-darwin" - "aarch64-darwin" - "x86_64-windows" - ], + # stablePlatforms ? [ + # "x86_64-linux" + # "aarch64-linux" + # "armv7a-linux" + # "x86_64-darwin" + # "aarch64-darwin" + # "x86_64-windows" + # ], }: # Nim version(s) that are known to be stable # See: https://github.com/status-im/nimbus-build-system/commits/master/vendor @@ -79,6 +79,7 @@ assert ( ''; license = with licenses; [asl20 mit]; mainProgram = "nimbus_beacon_node"; - platforms = stablePlatforms; + # platforms = stablePlatforms; + platforms = ["x86_64-linux"]; }; }