From 04990cd743696054e5da1539fba02bbe9687a3de Mon Sep 17 00:00:00 2001
From: Kate <kit-ty-kate@outlook.com>
Date: Fri, 17 May 2024 14:52:19 +0100
Subject: [PATCH] Use opam 2.2 everywhere

---
 packages/setup-ocaml/src/cache.ts | 3 +--
 packages/setup-ocaml/src/opam.ts  | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/setup-ocaml/src/cache.ts b/packages/setup-ocaml/src/cache.ts
index fcb011256..f5811a6d0 100644
--- 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
index a55df26dd..17b373a88 100644
--- 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({