Skip to content

Commit 0cb608f

Browse files
committed
WIP don't control concurrency from INSIDE_DUNE
Unfortuantely due to the way build forwarding warnings work we warn alot since DUNE_JOBS differs from the default. Signed-off-by: Ali Caglayan <alizter@gmail.com>
1 parent b94c375 commit 0cb608f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/dune_config_file/dune_config_file.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ module Dune_config = struct
484484

485485
let default =
486486
{ display = Simple { verbosity = Quiet; status_line = not Execution_env.inside_dune }
487-
; concurrency = (if Execution_env.inside_dune then Fixed 1 else Auto)
487+
; concurrency = Auto
488488
; terminal_persistence = Clear_on_rebuild
489489
; sandboxing_preference = []
490490
; cache_enabled = Enabled_except_user_rules

test/blackbox-tests/test-cases/dune

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
(env-vars
44
(DUNE_CONFIG__BACKGROUND_SANDBOXES disabled)
55
(DUNE_CONFIG__BACKGROUND_DIGESTS disabled)
6+
(DUNE_JOBS 1)
67
;; We set ocaml to always be colored since it changes the output of
78
;; ocamlc error messages. See https://github.com/ocaml/ocaml/issues/14144
89
(OCAML_COLOR always))
@@ -23,6 +24,7 @@
2324
(applies_to :whole_subtree)
2425
(deps
2526
(env_var OCAML_COLOR)
27+
(env_var DUNE_JOBS)
2628
%{bin:dune_cmd}
2729
(package dune))
2830
;; We don't allow conflict markers in tests

0 commit comments

Comments
 (0)