Revert "Revert "Update the environment to handle the new --confirm-le…

…vel option from opam 2.1"" This reverts commit de41715.
kit-ty-kate · Jun 2, 2021 · d8e1264 · d8e1264
1 parent 2affed6
commit d8e1264
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/pipeline.ml b/src/pipeline.ml
@@ -57,8 +57,7 @@ let install_compiler_df ~arch ~switch opam_image =
   maybe_add_beta switch @@
   maybe_add_multicore switch @@
   env ["OPAMYES", "1";
-       "OPAMDEPEXTYES", "1"; (* Remove this when https://github.com/ocaml/opam/pull/4563 is merged *)
-       "OPAMUNSAFEDEPEXTYES", "1";
+       "OPAMCONFIRMLEVEL", "unsafe-yes";
        "OPAMERRLOGLEN", "0"; (* Show the whole log if it fails *)
        "OPAMPRECISETRACKING", "1"; (* Mitigate https://github.com/ocaml/opam/issues/3997 *)
       ] @@