Resolve post- merge-conflict resolution issues

erlef · Aug 3, 2023 · fedde08 · fedde08
1 parent 08ad497
commit fedde08
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -9979,11 +9979,9 @@ async function maybeInstallRebar3(rebar3Spec) {
 
 async function getOTPVersion(otpSpec0, osVersion) {
   const otpVersions = await getOTPVersions(osVersion)
-  let otpSpec = otpSpec0.replace(/^OTP-/, '')
-  const otpVersion = getVersionFromSpec(
-    otpSpec,
-    Array.from(otpVersions.keys()).sort(),
-  )
+  let spec = otpSpec0.replace(/^OTP-/, '')
+  const versions = otpVersions
+  const otpVersion = getVersionFromSpec(spec, versions)
   if (otpVersion === null) {
     throw new Error(
       `Requested Erlang/OTP version (${otpSpec0}) not found in version list ` +

diff --git a/src/setup-beam.js b/src/setup-beam.js
@@ -163,11 +163,9 @@ async function maybeInstallRebar3(rebar3Spec) {
 
 async function getOTPVersion(otpSpec0, osVersion) {
   const otpVersions = await getOTPVersions(osVersion)
-  let otpSpec = otpSpec0.replace(/^OTP-/, '')
-  const otpVersion = getVersionFromSpec(
-    otpSpec,
-    Array.from(otpVersions.keys()).sort(),
-  )
+  let spec = otpSpec0.replace(/^OTP-/, '')
+  const versions = otpVersions
+  const otpVersion = getVersionFromSpec(spec, versions)
   if (otpVersion === null) {
     throw new Error(
       `Requested Erlang/OTP version (${otpSpec0}) not found in version list ` +