Allow chosen OTP version to affect chosen Elixir version (master)

Author: paulo-ferraz-oliveira

dist/index.js

@@ -26086,7 +26086,7 @@ async function getElixirVersion(exSpec0, otpVersion0) {
   }
 
   const [otpVersionsForElixirMap, elixirVersions, originListing, hexMirrors] =
-    await getElixirVersions()
+    await getElixirVersions(otpVersion0)
   const spec = exSpec0.replace(otpSuffix, '')
   const versions = elixirVersions
   const elixirVersionFromSpec = getVersionFromSpec(spec, versions)
@@ -26246,7 +26246,7 @@ async function getOTPVersions(osVersion) {
   return [otpVersions, originListing, hexMirrors]
 }
 
-async function getElixirVersions() {
+async function getElixirVersions(otpVersion0) {
   const originListing = '/builds/elixir/builds.txt'
   const hexMirrors = hexMirrorsInput()
   const elixirVersionsListings = await doWithMirrors({
@@ -26265,11 +26265,14 @@ async function getElixirVersions() {
     .forEach((line) => {
       const elixirMatch =
         line.match(/^v?(.+)-otp-([^ ]+)/) || line.match(/^v?([^ ]+)/)
-      const elixirVersion = elixirMatch[1]
+      let elixirVersion = elixirMatch[1]
       const otpVersion = elixirMatch[2]
       const otpVersions = otpVersionsForElixirMap[elixirVersion] || []
       if (otpVersion) {
         // -otp- present (special case)
+        if (otpVersion0 === 'master') {
+          elixirVersion = `${elixirVersion}-otp-${otpVersion}`
+        }
         otpVersions.push(otpVersion)
       }
       otpVersionsForElixirMap[elixirVersion] = otpVersions

src/setup-beam.js

@@ -211,7 +211,7 @@ async function getElixirVersion(exSpec0, otpVersion0) {
   }
 
   const [otpVersionsForElixirMap, elixirVersions, originListing, hexMirrors] =
-    await getElixirVersions()
+    await getElixirVersions(otpVersion0)
   const spec = exSpec0.replace(otpSuffix, '')
   const versions = elixirVersions
   const elixirVersionFromSpec = getVersionFromSpec(spec, versions)
@@ -371,7 +371,7 @@ async function getOTPVersions(osVersion) {
   return [otpVersions, originListing, hexMirrors]
 }
 
-async function getElixirVersions() {
+async function getElixirVersions(otpVersion0) {
   const originListing = '/builds/elixir/builds.txt'
   const hexMirrors = hexMirrorsInput()
   const elixirVersionsListings = await doWithMirrors({
@@ -390,11 +390,14 @@ async function getElixirVersions() {
     .forEach((line) => {
       const elixirMatch =
         line.match(/^v?(.+)-otp-([^ ]+)/) || line.match(/^v?([^ ]+)/)
-      const elixirVersion = elixirMatch[1]
+      let elixirVersion = elixirMatch[1]
       const otpVersion = elixirMatch[2]
       const otpVersions = otpVersionsForElixirMap[elixirVersion] || []
       if (otpVersion) {
         // -otp- present (special case)
+        if (otpVersion0 === 'master') {
+          elixirVersion = `${elixirVersion}-otp-${otpVersion}`
+        }
         otpVersions.push(otpVersion)
       }
       otpVersionsForElixirMap[elixirVersion] = otpVersions