Skip to content

Commit 96b90dd

Browse files
committed
wb | remove eventlogged flag
1 parent ccbebb6 commit 96b90dd

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

nix/workbench/backend/nomad.nix

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
, lib
33
, stateDir
44
, subBackendName
5-
# TODO: Fetch this from config services inside materialise-profile !
6-
, eventlogged ? true
75
, ...
86
}:
97
let
@@ -147,20 +145,15 @@ let
147145
# the one used to enter the shell ??????????
148146
cardano-node = rec {
149147
# Local reference only used if not "cloud".
150-
nix-store-path = with pkgs;
151-
if eventlogged
152-
then cardanoNodePackages.cardano-node.passthru.eventlogged
153-
else cardanoNodePackages.cardano-node.passthru.noGitRev
154-
;
148+
# Avoid rebuilding on every commit because of `set-git-rev`.
149+
nix-store-path = pkgs.cardanoNodePackages.cardano-node.passthru.noGitRev;
155150
flake-reference = "github:intersectmbo/cardano-node";
156-
flake-output =
157-
if eventlogged
158-
then "cardanoNodePackages.cardano-node.passthru.eventlogged"
159-
else "cardanoNodePackages.cardano-node.passthru.noGitRev"
151+
flake-output = "cardanoNodePackages.cardano-node.passthru.noGitRev"
160152
;
161153
};
162154
cardano-cli = rec {
163155
# Local reference only used if not "cloud".
156+
# Avoid rebuilding on every commit because of `set-git-rev`.
164157
nix-store-path = pkgs.cardanoNodePackages.cardano-cli.passthru.noGitRev;
165158
flake-reference = "github:input-output-hk/cardano-cli";
166159
flake-output = "cardanoNodePackages.cardano-cli.passthru.noGitRev";

nix/workbench/service/healthcheck.nix

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
, backend
33
, profile
44
, nodeSpecs
5-
, eventlogged ? true
65
}:
76

87
with pkgs.lib;
@@ -14,18 +13,16 @@ let
1413
grep = pkgs.gnugrep;
1514
jq = pkgs.jq;
1615
# Avoid rebuilding the script on every commit.
17-
# Both `eventlogged` and `noGitRev` do not have `set-git-rev`.
16+
# `noGitRev` does not have `set-git-rev` that is set on every commit.
1817
cardano-node = with pkgs;
1918
if backend.useCabalRun
2019
then "cardano-node"
21-
else if eventlogged
22-
then cardanoNodePackages.cardano-node.passthru.eventlogged + "/bin/cardano-node"
23-
else cardanoNodePackages.cardano-node.passthru.noGitRev + "/bin/cardano-node"
20+
else cardanoNodePackages.cardano-node.passthru.noGitRev + "/bin/cardano-node"
2421
;
2522
cardano-cli = with pkgs;
2623
if backend.useCabalRun
2724
then "cardano-cli"
28-
else cardanoNodePackages.cardano-cli.passthru.noGitRev + "/bin/cardano-cli";
25+
else cardanoNodePackages.cardano-cli.passthru.noGitRev + "/bin/cardano-cli";
2926
in {
3027
start =
3128
# Assumptions:

nix/workbench/service/nodes.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ let
137137
} // optionalAttrs (profiling != "none") {
138138
inherit profiling;
139139
} // optionalAttrs (profiling == "none") {
140-
# Switch to `cardano-node.passthru.noGitRev` if eventlog is not needed.
141-
eventlog = mkForce true;
140+
# Switch to `noGitRev` to avoid rebuilding with every commit.
141+
package = pkgs.cardano-node.passthru.noGitRev;
142142
} // optionalAttrs backend.useCabalRun {
143143
# Allow the shell function to take precedence.
144-
executable = "cardano-node";
144+
executable = "cardano-node";
145145
} // optionalAttrs isProducer {
146146
operationalCertificate = "../genesis/node-keys/node${toString i}.opcert";
147147
kesKey = "../genesis/node-keys/node-kes${toString i}.skey";

0 commit comments

Comments
 (0)