From 2eb4368f55e11ac76b85f3f381aa0606407d6eba Mon Sep 17 00:00:00 2001 From: Alexander Esgen Date: Mon, 30 Jan 2023 12:09:38 +0100 Subject: [PATCH 1/3] Upgrade stylish-haskell to 0.14.4.0 --- nix/pkgs.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nix/pkgs.nix b/nix/pkgs.nix index c98956a6317..fc8f8edba18 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -24,9 +24,12 @@ with pkgs; { src = pkgs.fetchFromGitHub { owner = "haskell"; repo = "stylish-haskell"; - rev = "v0.14.3.0"; - sha256 = "sha256-TF8VxrkE142D6dhWMbuAWTfVTafm8I2kpSnyW4eA8d0="; + rev = "v0.14.4.0"; + sha256 = "sha256-e5p2P54JabZsb4G1oTRI71hKzVdqd9TgYBwEXa63egg="; }; + cabalProjectLocal = '' + allow-older: ghc-lib-parser:base + ''; compiler-nix-name = localConfig.ghcVersion; inherit (ouroborosNetworkHaskellPackages) index-state; }).stylish-haskell.components.exes.stylish-haskell; From 49273237c76e28652e27e447d164bf5902113fd5 Mon Sep 17 00:00:00 2001 From: Alexander Esgen Date: Mon, 30 Jan 2023 12:09:38 +0100 Subject: [PATCH 2/3] Cicero: double memory quota to 32 GB --- nix/cells/automation/pipelines.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/cells/automation/pipelines.nix b/nix/cells/automation/pipelines.nix index efe388d975f..7fdcb253290 100644 --- a/nix/cells/automation/pipelines.nix +++ b/nix/cells/automation/pipelines.nix @@ -28,7 +28,7 @@ skippedDescription = lib.escapeShellArg "No nix builder available for this system"; }; - memory = 1024 * 16; + memory = 1024 * 32; nomad.resources.cpu = 10000; }; } From 34576a7ba02ac25535e4811d8442ff954225c29d Mon Sep 17 00:00:00 2001 From: Alexander Esgen Date: Tue, 31 Jan 2023 16:26:56 +0100 Subject: [PATCH 3/3] Mark golden test files as generated for smaller PR diffs https://github.com/github/linguist/blob/master/docs/overrides.md#generated-code --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index 03e5e1237f3..85b91f27e5e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,7 @@ nix/.stack.nix/*.nix linguist-generated=true .stack-to-nix.cache linguist-generated=true nix/.stack-pkgs.nix linguist-generated=true + +ouroboros-consensus-byron-test/test/golden/**/* linguist-generated=true +ouroboros-consensus-shelley-test/test/golden/**/* linguist-generated=true +ouroboros-consensus-cardano-test/test/golden/**/* linguist-generated=true