Merge pull request #346 from ocaml/opam-2.1.2

Solve the CI puzzle with opam 2.1.2

Author: smorimoto

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to
 
 ## [unreleased]
 
+### Changed
+
+- Remove some hacks as `--no-depexts` is now used in CLI 2.0 mode from opam
+  2.1.2.
+
 ## [2.0.0-beta9]
 
 ### Changed

dist/index.js

@@ -26,8 +26,6 @@ export async function installDepext(ocamlVersion: string): Promise<void> {
 export async function installSystemPackages(fpaths: string[]): Promise<void> {
   core.startGroup("Install system packages required by opam packages");
   const fnames = fpaths.map((fpath) => path.basename(fpath, ".opam"));
-  await exec("opam", ["depext", ...fnames, ...OPAM_DEPEXT_FLAGS], {
-    env: { ...process.env, PATH: process.env.PATH || "", OPAMCLI: "2.0" },
-  });
+  await exec("opam", ["depext", ...fnames, ...OPAM_DEPEXT_FLAGS]);
   core.endGroup();
 }

dist/post/index.js

@@ -11,9 +11,7 @@ const {
 
 export async function installDune(): Promise<void> {
   core.startGroup("Install dune");
-  await exec("opam", ["depext", "dune", "--install"], {
-    env: { ...process.env, PATH: process.env.PATH || "", OPAMCLI: "2.0" },
-  });
+  await exec("opam", ["depext", "dune", "--install"]);
   core.endGroup();
 }
 

src/depext.ts

@@ -36,8 +36,8 @@ export async function installer(): Promise<void> {
   const platform = getPlatform();
   const numberOfProcessors = os.cpus().length;
   const isDebug = core.isDebug();
+  core.exportVariable("OPAMCLI", "2.0");
   core.exportVariable("OPAMCOLOR", "always");
-  core.exportVariable("OPAMCONFIRMLEVEL", "unsafe-yes");
   core.exportVariable("OPAMERRLOGLEN", 0);
   core.exportVariable("OPAMJOBS", numberOfProcessors);
   core.exportVariable("OPAMPRECISETRACKING", 1);