git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Merge #473

473: Add bors.toml to enable bors r=hamishmack a=hamishmack See https://github.com/input-output-hk/iohk-ops/blob/master/docs/bors.md Co-authored-by: Hamish Mackenzie <Hamish.Mackenzie@iohk.io>

commitd5d3752b81f301741d55627d444b180600014f46 authoriohk-bors[bot] <43231472+iohk-bors[bot]@users.noreply.github.com> dateSun 8 Mar 2020, 05:47 (7 years ago) parent428d43ddee2a9d
2 files changed+15−4
compare with iko/ghcjs-patch-master
unifiedsplit
bors.toml+8 release.nix+7−4
bors.tomlnew file+8
@@ -0,0 +1,8 @@
1+status = [
2+ "buildkite/haskell-dot-nix",
3+ "ci/hydra:Cardano:haskell-nix:required",
4+]
5+timeout_sec = 7200
6+required_approvals = 1
7+block_labels = [ "WIP", "DO NOT MERGE" ]
8+delete_merged_branches = true
release.nix+7−4
@@ -72,11 +72,14 @@ in allJobs // {
7272 constituents =
7373 collect isDerivation allJobs.R1903.native
7474 ++ collect isDerivation allJobs.R1909.native
75− # Windows cross compiling with GHC 8.8.2 is broken
76− # ++ collect isDerivation allJobs.R1903.x86_64-pc-mingw32
77− # ++ collect isDerivation allJobs.R1909.x86_64-w64-mingw32
75+ ++ collect isDerivation allJobs.R1903.x86_64-pc-mingw32
76+ ++ collect isDerivation allJobs.R1909.x86_64-w64-mingw32
7877 ++ collect isDerivation allJobs.R1903.x86_64-unknown-linux-musl
79− ++ collect isDerivation allJobs.R1909.x86_64-unknown-linux-musl;
78+ ++ collect isDerivation (allJobs.R1909.x86_64-unknown-linux-musl
79+ // {
80+ # Exclude failing test (openssl issue in nixpkgs R1909 with musl)
81+ tests = filterAttrs (n: _: n != "fully-static") allJobs.R1909.x86_64-unknown-linux-musl.tests;
82+ });
8083 };
8184 }
8285