From d420927449c4765209fd0cece3b06f8abb71e75c Mon Sep 17 00:00:00 2001
From: Sora Morimoto <sora@morimoto.io>
Date: Fri, 12 Nov 2021 02:45:22 +0900
Subject: [PATCH] Unlock opam 2.1 on the Ubuntu and macOS runners

Signed-off-by: Sora Morimoto <sora@morimoto.io>
---
 CHANGELOG.md       | 4 ++++
 dist/index.js      | 3 ++-
 dist/post/index.js | 2 +-
 src/installer.ts   | 1 +
 src/opam.ts        | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cba2f7f..a1e1fe6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to
 
 ## [unreleased]
 
+### Changed
+
+- Unlock opam 2.1 on the Ubuntu and macOS runners.
+
 ## [2.0.0-beta5]
 
 ### Changed
diff --git a/dist/index.js b/dist/index.js
index 32035418..c5e380f6 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -114992,7 +114992,7 @@ function createHttpClient() {
 }
 function getLatestOpamRelease() {
     return opam_awaiter(this, void 0, void 0, function* () {
-        const semverRange = "<2.1.0";
+        const semverRange = "<2.2.0";
         const octokit = lib_github.getOctokit(constants_GITHUB_TOKEN);
         const { data: releases } = yield octokit.rest.repos.listReleases({
             owner: "ocaml",
@@ -115824,6 +115824,7 @@ function installer() {
         const platform = getPlatform();
         const numberOfProcessors = external_os_.cpus().length;
         const isDebug = lib_core.isDebug();
+        lib_core.exportVariable("OPAMCLI", "2.0");
         lib_core.exportVariable("OPAMCOLOR", "always");
         lib_core.exportVariable("OPAMERRLOGLEN", 0);
         lib_core.exportVariable("OPAMJOBS", numberOfProcessors);
diff --git a/dist/post/index.js b/dist/post/index.js
index e9784d89..f498a2bb 100644
--- a/dist/post/index.js
+++ b/dist/post/index.js
@@ -113805,7 +113805,7 @@ function createHttpClient() {
 }
 function getLatestOpamRelease() {
     return opam_awaiter(this, void 0, void 0, function* () {
-        const semverRange = "<2.1.0";
+        const semverRange = "<2.2.0";
         const octokit = github.getOctokit(GITHUB_TOKEN);
         const { data: releases } = yield octokit.rest.repos.listReleases({
             owner: "ocaml",
diff --git a/src/installer.ts b/src/installer.ts
index a03e673a..4826a341 100644
--- a/src/installer.ts
+++ b/src/installer.ts
@@ -36,6 +36,7 @@ export async function installer(): Promise<void> {
   const platform = getPlatform();
   const numberOfProcessors = os.cpus().length;
   const isDebug = core.isDebug();
+  core.exportVariable("OPAMCLI", "2.0");
   core.exportVariable("OPAMCOLOR", "always");
   core.exportVariable("OPAMERRLOGLEN", 0);
   core.exportVariable("OPAMJOBS", numberOfProcessors);
diff --git a/src/opam.ts b/src/opam.ts
index 42bfacd5..b663a54d 100644
--- a/src/opam.ts
+++ b/src/opam.ts
@@ -30,7 +30,7 @@ async function getLatestOpamRelease(): Promise<{
   version: string;
   browserDownloadUrl: string;
 }> {
-  const semverRange = "<2.1.0";
+  const semverRange = "<2.2.0";
   const octokit = github.getOctokit(GITHUB_TOKEN);
   const { data: releases } = await octokit.rest.repos.listReleases({
     owner: "ocaml",