Skip to content

Commit 0d70ed3

Browse files
authored
Merge pull request #837 from ocaml/always-install-dune
Always install dune within every extends
2 parents 37729d8 + 1c7a3ed commit 0d70ed3

File tree

7 files changed

+32
-2
lines changed

7 files changed

+32
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ and this project adheres to
88

99
## [unreleased]
1010

11+
### Fixed
12+
13+
- Always install dune within every extends.
14+
1115
## [3.0.2]
1216

1317
### Fixed

analysis/dist/index.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lint-fmt/dist/index.js

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/analysis/src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import * as process from "node:process";
22
import * as core from "@actions/core";
33
import { analysis } from "./analysis.js";
4-
import { installOpamPackages } from "./opam.js";
4+
import { installDune, installOpamPackages } from "./opam.js";
55

66
async function run() {
77
try {
88
await installOpamPackages();
9+
await installDune();
910
await analysis();
1011
process.exit(0);
1112
} catch (error) {

packages/analysis/src/opam.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@ export async function installOpamPackages() {
1414
]);
1515
});
1616
}
17+
18+
export async function installDune() {
19+
await core.group("Install dune", async () => {
20+
await exec("opam", ["install", "dune"]);
21+
});
22+
}

packages/lint-fmt/src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ import * as process from "node:process";
22
import * as core from "@actions/core";
33
import { checkFmt } from "./lint.js";
44
import { getOcamlformatVersion } from "./ocamlformat.js";
5-
import { installOcamlformat } from "./opam.js";
5+
import { installDune, installOcamlformat } from "./opam.js";
66

77
async function run() {
88
try {
99
const version = await getOcamlformatVersion();
1010
if (version) {
1111
await installOcamlformat(version);
1212
}
13+
await installDune();
1314
await checkFmt();
1415
process.exit(0);
1516
} catch (error) {

packages/lint-fmt/src/opam.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ export async function installOcamlformat(version: string) {
66
await exec("opam", ["install", `ocamlformat=${version}`]);
77
});
88
}
9+
10+
export async function installDune() {
11+
await core.group("Install dune", async () => {
12+
await exec("opam", ["install", "dune"]);
13+
});
14+
}

0 commit comments

Comments
 (0)