opam env

Signed-off-by: Sora Morimoto <[email protected]>

Author: smorimoto

dist/index.js

@@ -2,7 +2,7 @@ import * as process from "node:process";
 import { exec } from "@actions/exec";
 
 export async function lintOdoc() {
-  const exitCode = await exec("opam", ["exec", "--", "dune", "build", "@doc"], {
+  const exitCode = await exec("dune", ["build", "@doc"], {
     env: {
       ...process.env,
       PATH: process.env.PATH ?? "",

dist/post/index.js

@@ -1,5 +1,5 @@
 import { exec } from "@actions/exec";
 
 export async function checkFmt() {
-  await exec("opam", ["exec", "--", "dune", "build", "@fmt"]);
+  await exec("dune", ["build", "@fmt"]);
 }

lint-doc/dist/index.js

@@ -5,5 +5,5 @@ export async function opamLint() {
 }
 
 export async function opamDuneLint() {
-  await exec("opam", ["exec", "--", "opam-dune-lint"]);
+  await exec("opam-dune-lint");
 }

lint-fmt/dist/index.js

@@ -27,14 +27,7 @@ export async function trimDuneCache() {
         run_id,
       });
       const cacheSize = Math.floor(5000 / totalCount);
-      await exec("opam", [
-        "exec",
-        "--",
-        "dune",
-        "cache",
-        "trim",
-        `--size=${cacheSize}MB`,
-      ]);
+      await exec("dune", ["dune", "cache", "trim", `--size=${cacheSize}MB`]);
     },
   );
 }

lint-opam/dist/index.js

@@ -24,6 +24,7 @@ import {
   repositoryAddAll,
   repositoryRemoveAll,
   setupOpam,
+  setupOpamEnv,
 } from "./opam.js";
 import { getOpamLocalPackages } from "./packages.js";
 import { resolveCompiler } from "./version.js";
@@ -71,20 +72,20 @@ export async function installer() {
     await installOcaml(ocamlCompiler);
     await saveOpamCache();
   }
+  setupOpamEnv();
   if (DUNE_CACHE) {
     await restoreDuneCache();
     await installDune();
     core.exportVariable("DUNE_CACHE", "enabled");
     core.exportVariable("DUNE_CACHE_TRANSPORT", "direct");
     core.exportVariable("DUNE_CACHE_STORAGE_MODE", "copy");
   }
-  core.exportVariable("CLICOLOR_FORCE", "1");
   const fnames = await getOpamLocalPackages();
   if (fnames.length > 0) {
     if (OPAM_PIN) {
       await pin(fnames);
     }
   }
   await exec("opam", ["--version"]);
-  await exec("opam", ["exec", "--", "ocaml", "-version"]);
+  await exec("ocaml", ["-version"]);
 }