From c99eca4e27f3f895ef9bdd05aca4f0edd6e24145 Mon Sep 17 00:00:00 2001 From: Kate Date: Tue, 22 Mar 2022 16:09:42 +0000 Subject: [PATCH] Unset the jobs variable from the opam config (faulty opam 2.0 behaviour) --- src-opam/dockerfile_opam.ml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src-opam/dockerfile_opam.ml b/src-opam/dockerfile_opam.ml index 46c77625..8a702053 100644 --- a/src-opam/dockerfile_opam.ml +++ b/src-opam/dockerfile_opam.ml @@ -404,6 +404,7 @@ let all_ocaml_compilers hub_id arch distro = @@ sandbox @@ run "opam init -k git -a /home/opam/opam-repository --bare%s" (if os_family = `Windows then " --disable-sandboxing" else "") + @@ run "sed -i.bak -e '/^jobs: /d' /home/opam/.opam/config && rm /home/opam/.opam/config.bak" @@ compilers @@ run "opam switch %s" (OV.(to_string (with_patch OV.Releases.latest None))) @@ entrypoint_exec (pers @ ["opam"; "config"; "exec"; "--"]) @@ -445,6 +446,7 @@ let separate_ocaml_compilers hub_id arch distro = @@ sandbox @@ run "opam init -k git -a /home/opam/opam-repository --bare%s" (if os_family = `Windows then "--disable-sandboxing" else "") + @@ run "sed -i.bak -e '/^jobs: /d' /home/opam/.opam/config && rm /home/opam/.opam/config.bak" @@ add_remote @@ variants @@ run "opam switch %s" default_switch_name