Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build monad-schedule without parallelism in CI #373

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ jobs:
- name: Flake check
run: nix flake check
- name: Build all packages
run: nix build --accept-flake-config
run: |
# Pre-build monad-schedule without parallelism to avoid timing issues under load
nix build --accept-flake-config --max-jobs 1 .#monad-schedule-lib
nix build --accept-flake-config
- name: Run tests
run: |
nix develop --accept-flake-config -c cabal update
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@
}
{ };
})
(hfinal: hprev: lib.optionalAttrs prev.stdenv.isDarwin {
monad-schedule = dontCheck hprev.monad-schedule;
})
(hfinal: hprev: lib.optionalAttrs (lib.versionOlder hprev.ghc.version "9.4") {
time-domain = doJailbreak hprev.time-domain;
})
Expand Down Expand Up @@ -142,6 +139,14 @@
(prev.linkFarm "docsAndSdist" { docs = final.rhine-docs; sdist = rhine-sdist; })
];
};

# All monad-schedule libraries
monad-schedule-lib = prev.buildEnv
{
name = "monad-schedule-lib";
paths = map (hp: hp.monad-schedule) (attrValues hps);
pathsToLink = [ "/lib" ];
};
};

overlay = lib.composeManyExtensions
Expand All @@ -165,6 +170,7 @@
# Usage: nix build
packages = forAllPlatforms (system: pkgs: {
default = pkgs.rhine-all;
monad-schedule = pkgs.monad-schedule-lib;
});

# We re-export the entire nixpkgs package set with our overlay.
Expand Down
Loading