Merge PR coq#9647: [default.nix] Enable parallel build

Reviewed-by: Zimmi48 Reviewed-by: ejgallego
ggonthier · Mar 19, 2019 · 0a2773c · 0a2773c
2 parents 2b68b22 + 3219cf3
commit 0a2773c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;
 })