Use opam 2.2 everywhere

ocaml · May 17, 2024 · 04990cd · 04990cd
1 parent 37f35ed
commit 04990cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/setup-ocaml/src/cache.ts b/packages/setup-ocaml/src/cache.ts
@@ -65,8 +65,7 @@ async function composeOpamCacheKeys() {
     PLATFORM === "win32"
       ? PLATFORM
       : `${PLATFORM}-${(await getSystemIdentificationInfo()).version}`;
-  const opamVersion =
-    PLATFORM === "win32" ? "0.0.0.2" : (await getLatestOpamRelease()).version;
+  const opamVersion = (await getLatestOpamRelease()).version;
   const ocamlCompiler = await resolveCompiler(OCAML_COMPILER);
   const ocamlVersion = ocamlCompiler.toLowerCase().replaceAll(/\W/g, "_");
   const sandboxed = OPAM_DISABLE_SANDBOXING ? "nosandbox" : "sandbox";

diff --git a/packages/setup-ocaml/src/opam.ts b/packages/setup-ocaml/src/opam.ts
@@ -28,7 +28,10 @@ import {
 import { getCygwinVersion } from "./win32.js";
 
 export async function getLatestOpamRelease() {
-  const semverRange = ALLOW_PRERELEASE_OPAM ? "*" : "<2.2.0";
+  const semverRange =
+    ALLOW_PRERELEASE_OPAM
+      ? "*"
+      : "<2.3.0";
   const octokit = github.getOctokit(GITHUB_TOKEN);
   const opam_platform = PLATFORM === "win32" ? "windows" : PLATFORM;
   const { data: releases } = await octokit.rest.repos.listReleases({