diff options
| author | Théo Zimmermann | 2019-03-19 17:55:58 +0100 |
|---|---|---|
| committer | Théo Zimmermann | 2019-03-19 17:55:58 +0100 |
| commit | 0a2773c90b69e301ec1d7203e8188694244b0167 (patch) | |
| tree | 747fb9d6280cf313a087435319ed9201aeb556ce | |
| parent | 2b68b2223527b5bc247bd338ae4613a00654636c (diff) | |
| parent | 3219cf3d4f308153a6ed0d48faee0eb056ccf0de (diff) | |
Merge PR #9647: [default.nix] Enable parallel build
Reviewed-by: Zimmi48
Reviewed-by: ejgallego
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | dev/ci/nix/coq.nix | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd94051a37..828380894e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -320,6 +320,7 @@ pkg:opam: dependencies: [] # We don't need to download build artifacts before_script: [] # We don't want to use the shared 'before_script' script: + - cat /proc/{cpu,mem}info || true # Use current worktree as tmpdir to allow exporting artifacts in case of failure - export TMPDIR=$PWD # We build an expression rather than a direct URL to not be dependent on diff --git a/default.nix b/default.nix index 3cc0bfb11f..1e2cb3625d 100644 --- a/default.nix +++ b/default.nix @@ -82,6 +82,8 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; + enableParallelBuilding = true; + buildFlags = [ "world" "byte" ] ++ optional buildDoc "doc-html"; installTargets = diff --git a/dev/ci/nix/coq.nix b/dev/ci/nix/coq.nix index ecd280e58d..b610790f61 100644 --- a/dev/ci/nix/coq.nix +++ b/dev/ci/nix/coq.nix @@ -5,5 +5,4 @@ let coq = callPackage wd { buildDoc = false; doInstallCheck = false; coq-version coq.overrideAttrs (o: { name = "coq-local-${branch}"; src = fetchGit "${wd}"; - enableParallelBuilding = true; }) |