Merge pull request #710 from ocaml/do-not-install-depext-opam-2.2

Do not install `opam-depext` if using opam 2.2 or later

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to
 
 ## [unreleased]
 
+### Changed
+
+- Do not install `opam-depext` if using opam 2.2 or later.
+
 ## [2.1.0]
 
 ### Added

packages/setup-ocaml/src/constants.ts

@@ -16,16 +16,21 @@ export enum Platform {
   Win32 = "win32",
 }
 
+const platform = getPlatform();
+
 export const CYGWIN_ROOT = path.join("D:", "cygwin");
 
 export const CYGWIN_ROOT_BIN = path.join(CYGWIN_ROOT, "bin");
 
 export const CYGWIN_ROOT_WRAPPERBIN = path.join(CYGWIN_ROOT, "wrapperbin");
 
-export const ALLOW_PRELEASE_OPAM = core.getBooleanInput("allow-prelease-opam", {
-  required: false,
-  trimWhitespace: true,
-});
+// [todo] remove the branch for Windows once opam 2.2 is released as stable.
+export const ALLOW_PRELEASE_OPAM =
+  platform !== Platform.Win32 &&
+  core.getBooleanInput("allow-prelease-opam", {
+    required: false,
+    trimWhitespace: true,
+  });
 
 export const CACHE_PREFIX = core.getInput("cache-prefix", {
   required: false,
@@ -47,10 +52,13 @@ export const OCAML_COMPILER = core.getInput("ocaml-compiler", {
   trimWhitespace: true,
 });
 
-export const OPAM_DEPEXT = core.getBooleanInput("opam-depext", {
-  required: false,
-  trimWhitespace: true,
-});
+// [todo] remove this once opam 2.2 is released as stable.
+export const OPAM_DEPEXT =
+  !ALLOW_PRELEASE_OPAM &&
+  core.getBooleanInput("opam-depext", {
+    required: false,
+    trimWhitespace: true,
+  });
 
 export const OPAM_DEPEXT_FLAGS = core
   .getInput("opam-depext-flags", { required: false, trimWhitespace: true })
@@ -77,8 +85,6 @@ const repositories_yaml = yaml.parse(
   core.getInput("opam-repositories", { required: false, trimWhitespace: true }),
 ) as Record<string, string> | null;
 
-const platform = getPlatform();
-
 const defaultRepository =
   platform === Platform.Win32
     ? "https://github.com/ocaml-opam/opam-repository-mingw.git#sunset"

packages/setup-ocaml/src/installer.ts

@@ -40,7 +40,7 @@ export async function installer() {
   core.exportVariable("OPAMERRLOGLEN", 0);
   core.exportVariable("OPAMJOBS", os.cpus().length);
   core.exportVariable("OPAMPRECISETRACKING", 1);
-  // [todo] remove this line once we unlock opam 2.2
+  // [todo] remove this once opam 2.2 is released as stable.
   // https://github.com/ocaml/opam/issues/3447
   core.exportVariable("OPAMSOLVERTIMEOUT", 1000);
   core.exportVariable("OPAMYES", 1);