Merge pull request #837 from ocaml/always-install-dune

Always install dune within every extends
ocaml · Aug 4, 2024 · 0d70ed3 · 0d70ed3
2 parents 37729d8 + 1c7a3ed
commit 0d70ed3
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to
 
 ## [unreleased]
 
+### Fixed
+
+- Always install dune within every extends.
+
 ## [3.0.2]
 
 ### Fixed

diff --git a/analysis/dist/index.js b/analysis/dist/index.js
diff --git a/lint-fmt/dist/index.js b/lint-fmt/dist/index.js
diff --git a/packages/analysis/src/index.ts b/packages/analysis/src/index.ts
@@ -1,11 +1,12 @@
 import * as process from "node:process";
 import * as core from "@actions/core";
 import { analysis } from "./analysis.js";
-import { installOpamPackages } from "./opam.js";
+import { installDune, installOpamPackages } from "./opam.js";
 
 async function run() {
   try {
     await installOpamPackages();
+    await installDune();
     await analysis();
     process.exit(0);
   } catch (error) {

diff --git a/packages/analysis/src/opam.ts b/packages/analysis/src/opam.ts
@@ -14,3 +14,9 @@ export async function installOpamPackages() {
     ]);
   });
 }
+
+export async function installDune() {
+  await core.group("Install dune", async () => {
+    await exec("opam", ["install", "dune"]);
+  });
+}
diff --git a/packages/lint-fmt/src/index.ts b/packages/lint-fmt/src/index.ts
@@ -2,14 +2,15 @@ import * as process from "node:process";
 import * as core from "@actions/core";
 import { checkFmt } from "./lint.js";
 import { getOcamlformatVersion } from "./ocamlformat.js";
-import { installOcamlformat } from "./opam.js";
+import { installDune, installOcamlformat } from "./opam.js";
 
 async function run() {
   try {
     const version = await getOcamlformatVersion();
     if (version) {
       await installOcamlformat(version);
     }
+    await installDune();
     await checkFmt();
     process.exit(0);
   } catch (error) {

diff --git a/packages/lint-fmt/src/opam.ts b/packages/lint-fmt/src/opam.ts
@@ -6,3 +6,9 @@ export async function installOcamlformat(version: string) {
     await exec("opam", ["install", `ocamlformat=${version}`]);
   });
 }
+
+export async function installDune() {
+  await core.group("Install dune", async () => {
+    await exec("opam", ["install", "dune"]);
+  });
+}