Skip to content

Commit 04990cd

Browse files
committed
Use opam 2.2 everywhere
1 parent 37f35ed commit 04990cd

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

packages/setup-ocaml/src/cache.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ async function composeOpamCacheKeys() {
6565
PLATFORM === "win32"
6666
? PLATFORM
6767
: `${PLATFORM}-${(await getSystemIdentificationInfo()).version}`;
68-
const opamVersion =
69-
PLATFORM === "win32" ? "0.0.0.2" : (await getLatestOpamRelease()).version;
68+
const opamVersion = (await getLatestOpamRelease()).version;
7069
const ocamlCompiler = await resolveCompiler(OCAML_COMPILER);
7170
const ocamlVersion = ocamlCompiler.toLowerCase().replaceAll(/\W/g, "_");
7271
const sandboxed = OPAM_DISABLE_SANDBOXING ? "nosandbox" : "sandbox";

packages/setup-ocaml/src/opam.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ import {
2828
import { getCygwinVersion } from "./win32.js";
2929

3030
export async function getLatestOpamRelease() {
31-
const semverRange = ALLOW_PRERELEASE_OPAM ? "*" : "<2.2.0";
31+
const semverRange =
32+
ALLOW_PRERELEASE_OPAM
33+
? "*"
34+
: "<2.3.0";
3235
const octokit = github.getOctokit(GITHUB_TOKEN);
3336
const opam_platform = PLATFORM === "win32" ? "windows" : PLATFORM;
3437
const { data: releases } = await octokit.rest.repos.listReleases({

0 commit comments

Comments
 (0)