Merge pull request #711 from ocaml/do-not-set-opam-cli-env-pre

Do not set `OPAMCLI` if pre-release opam is allowed
ocaml · Oct 20, 2023 · 1f76f14 · 1f76f14
2 parents 3a69246 + e6454fa
commit 1f76f14
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to
 
 - Do not install `opam-depext` if using opam 2.2 or later.
 
+### Fixed
+
+- Do not set `OPAMCLI` if pre-release opam is allowed.
+
 ## [2.1.0]
 
 ### Added

diff --git a/dist/index.js b/dist/index.js
diff --git a/packages/setup-ocaml/src/installer.ts b/packages/setup-ocaml/src/installer.ts
@@ -13,6 +13,7 @@ import {
   saveOpamCache,
 } from "./cache";
 import {
+  ALLOW_PRELEASE_OPAM,
   DUNE_CACHE,
   OCAML_COMPILER,
   OPAM_DEPEXT,
@@ -35,7 +36,11 @@ import { resolveCompiler } from "./version";
 
 export async function installer() {
   const platform = getPlatform();
-  core.exportVariable("OPAMCLI", "2.0");
+  if (!ALLOW_PRELEASE_OPAM) {
+    // [todo] remove this once opam 2.2 is released as stable.
+    // https://github.com/ocaml/setup-ocaml/issues/299
+    core.exportVariable("OPAMCLI", "2.0");
+  }
   core.exportVariable("OPAMCOLOR", "always");
   core.exportVariable("OPAMERRLOGLEN", 0);
   core.exportVariable("OPAMJOBS", os.cpus().length);