Skip to content

Commit

Permalink
Merge #4320 #4328
Browse files Browse the repository at this point in the history
4320: More memory for CI, upgrade stylish-haskell r=amesgen a=amesgen

# Description

 - `@Jasagredo` noted that CI fails relatively often due to memory limitations.
 - `@jorisdral` noted that stylish-haskell fails to compile on GHC 9.2.



4328: Mark golden test files as generated for smaller PR diffs r=amesgen a=amesgen

# Description

Motivated by looking at https://github.com/input-output-hk/ouroboros-network/pull/3971/files

https://github.com/github/linguist/blob/master/docs/overrides.md#generated-code



Co-authored-by: Alexander Esgen <alexander.esgen@iohk.io>
  • Loading branch information
iohk-bors[bot] and amesgen authored Jan 31, 2023
3 parents c244162 + 4927323 + 34576a7 commit 42f8152
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion nix/cells/automation/pipelines.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
skippedDescription = lib.escapeShellArg "No nix builder available for this system";
};

memory = 1024 * 16;
memory = 1024 * 32;
nomad.resources.cpu = 10000;
};
}
7 changes: 5 additions & 2 deletions nix/pkgs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 42f8152

Please sign in to comment.