From e138038669e5498161cb86f4b72a23d6ec6c4f53 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Tue, 3 Aug 2021 02:55:39 +0900 Subject: [PATCH] Set OPAMSOLVERTIMEOUT to 1000 to avoid a timeout Signed-off-by: Sora Morimoto --- CHANGELOG.md | 5 +++++ dist/index.js | 4 +++- src/installer.ts | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index acc78ca6..61109b87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ and this project adheres to ## [unreleased] +### Changed + +- Set `OPAMSOLVERTIMEOUT` to `1000` to avoid a timeout even if the opam solver + is slow. + ## [2.0.0-beta3] ### Changed diff --git a/dist/index.js b/dist/index.js index 840bce90..39191ef4 100644 --- a/dist/index.js +++ b/dist/index.js @@ -115956,7 +115956,9 @@ function installer() { lib_core.exportVariable("OPAMERRLOGLEN", 0); lib_core.exportVariable("OPAMJOBS", numberOfProcessors); lib_core.exportVariable("OPAMPRECISETRACKING", 1); - lib_core.exportVariable("OPAMSOLVERTIMEOUT", 500); + // [todo] remove this line once we unlock opam 2.2 + // https://github.com/ocaml/opam/issues/3447 + lib_core.exportVariable("OPAMSOLVERTIMEOUT", 1000); lib_core.exportVariable("OPAMVERBOSE", isDebug); lib_core.exportVariable("OPAMYES", 1); if (platform === Platform.Win32) { diff --git a/src/installer.ts b/src/installer.ts index bb7a06a9..a03e673a 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -40,7 +40,9 @@ export async function installer(): Promise { core.exportVariable("OPAMERRLOGLEN", 0); core.exportVariable("OPAMJOBS", numberOfProcessors); core.exportVariable("OPAMPRECISETRACKING", 1); - core.exportVariable("OPAMSOLVERTIMEOUT", 500); + // [todo] remove this line once we unlock opam 2.2 + // https://github.com/ocaml/opam/issues/3447 + core.exportVariable("OPAMSOLVERTIMEOUT", 1000); core.exportVariable("OPAMVERBOSE", isDebug); core.exportVariable("OPAMYES", 1); if (platform === Platform.Win32) {