Skip to content

Commit 6cfd092

Browse files
committed
Solve the CI puzzle with opam 2.1.2
Signed-off-by: Sora Morimoto <sora@morimoto.io>
1 parent 8d6b453 commit 6cfd092

File tree

5 files changed

+5
-17
lines changed

5 files changed

+5
-17
lines changed

dist/index.js

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

dist/post/index.js

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/depext.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ export async function installDepext(ocamlVersion: string): Promise<void> {
2626
export async function installSystemPackages(fpaths: string[]): Promise<void> {
2727
core.startGroup("Install system packages required by opam packages");
2828
const fnames = fpaths.map((fpath) => path.basename(fpath, ".opam"));
29-
await exec("opam", ["depext", ...fnames, ...OPAM_DEPEXT_FLAGS], {
30-
env: { ...process.env, PATH: process.env.PATH || "", OPAMCLI: "2.0" },
31-
});
29+
await exec("opam", ["depext", ...fnames, ...OPAM_DEPEXT_FLAGS]);
3230
core.endGroup();
3331
}

src/dune.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ const {
1111

1212
export async function installDune(): Promise<void> {
1313
core.startGroup("Install dune");
14-
await exec("opam", ["depext", "dune", "--install"], {
15-
env: { ...process.env, PATH: process.env.PATH || "", OPAMCLI: "2.0" },
16-
});
14+
await exec("opam", ["depext", "dune", "--install"]);
1715
core.endGroup();
1816
}
1917

src/installer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export async function installer(): Promise<void> {
3737
const numberOfProcessors = os.cpus().length;
3838
const isDebug = core.isDebug();
3939
core.exportVariable("OPAMCOLOR", "always");
40-
core.exportVariable("OPAMCONFIRMLEVEL", "unsafe-yes");
4140
core.exportVariable("OPAMERRLOGLEN", 0);
4241
core.exportVariable("OPAMJOBS", numberOfProcessors);
4342
core.exportVariable("OPAMPRECISETRACKING", 1);

0 commit comments

Comments
 (0)