Implement for tests

Author: paulo-ferraz-oliveira

dist/index.js

@@ -25915,8 +25915,8 @@ async function main() {
   const rebar3Spec = getInput('rebar3-version', false, 'rebar', versions)
 
   if (otpSpec !== 'false') {
-    await installOTP(otpSpec, osVersion)
-    const elixirInstalled = await maybeInstallElixir(elixirSpec, otpSpec)
+    const otpVersion = await installOTP(otpSpec, osVersion)
+    const elixirInstalled = await maybeInstallElixir(elixirSpec, otpVersion)
     if (elixirInstalled === true) {
       const shouldMixRebar = getInput('install-rebar', false)
       await mix(shouldMixRebar, 'rebar')
@@ -25958,10 +25958,10 @@ async function installOTP(otpSpec, osVersion) {
   return otpVersion
 }
 
-async function maybeInstallElixir(elixirSpec, otpSpec) {
+async function maybeInstallElixir(elixirSpec, otpVersion) {
   let installed = false
   if (elixirSpec) {
-    const elixirVersion = await getElixirVersion(elixirSpec, otpSpec)
+    const elixirVersion = await getElixirVersion(elixirSpec, otpVersion)
     core.startGroup(`Installing Elixir ${elixirVersion}`)
     await doWithMirrors({
       hexMirrors: hexMirrorsInput(),
@@ -26067,13 +26067,16 @@ function requestedVersionFor(tool, version, originListing, mirrors) {
   )
 }
 
-const knownBranches = ['main', 'master', 'maint']
+const knownBranches = ['master', 'maint', 'main']
 const nonSpecificVersions = ['nightly', 'latest']
 
 async function getElixirVersion(exSpec0, otpVersion0) {
-  const otpVersion = otpVersion0.match(/^(?:OTP-)?(.+)$/)[1]
-  const regex = `^(\\d{1,3}|${knownBranches.join('|')}|${nonSpecificVersions.join('|')})?.*$`
-  let otpVersionMajor = otpVersion.match(new RegExp(regex))[1]
+  let otpVersion = otpVersion0.replace(/-rc.*/, '')
+  knownBranches.forEach((branch) => {
+    otpVersion = otpVersion.replace(`${branch}-`, '').replace(`${branch}`, '')
+  })
+  // after this we should have either a number-string of an empty string
+  let otpVersionMajor = otpVersion.match(/(\d{1,3}).*/)?.[1] ?? null
 
   const otpSuffix = /-otp-(\d+)/
   const userSuppliedOtp = exSpec0.match(otpSuffix)?.[1] ?? null

src/setup-beam.js

@@ -35,8 +35,8 @@ async function main() {
   const rebar3Spec = getInput('rebar3-version', false, 'rebar', versions)
 
   if (otpSpec !== 'false') {
-    await installOTP(otpSpec, osVersion)
-    const elixirInstalled = await maybeInstallElixir(elixirSpec, otpSpec)
+    const otpVersion = await installOTP(otpSpec, osVersion)
+    const elixirInstalled = await maybeInstallElixir(elixirSpec, otpVersion)
     if (elixirInstalled === true) {
       const shouldMixRebar = getInput('install-rebar', false)
       await mix(shouldMixRebar, 'rebar')
@@ -78,10 +78,10 @@ async function installOTP(otpSpec, osVersion) {
   return otpVersion
 }
 
-async function maybeInstallElixir(elixirSpec, otpSpec) {
+async function maybeInstallElixir(elixirSpec, otpVersion) {
   let installed = false
   if (elixirSpec) {
-    const elixirVersion = await getElixirVersion(elixirSpec, otpSpec)
+    const elixirVersion = await getElixirVersion(elixirSpec, otpVersion)
     core.startGroup(`Installing Elixir ${elixirVersion}`)
     await doWithMirrors({
       hexMirrors: hexMirrorsInput(),
@@ -192,13 +192,16 @@ function requestedVersionFor(tool, version, originListing, mirrors) {
   )
 }
 
-const knownBranches = ['main', 'master', 'maint']
+const knownBranches = ['master', 'maint', 'main']
 const nonSpecificVersions = ['nightly', 'latest']
 
 async function getElixirVersion(exSpec0, otpVersion0) {
-  const otpVersion = otpVersion0.match(/^(?:OTP-)?(.+)$/)[1]
-  const regex = `^(\\d{1,3}|${knownBranches.join('|')}|${nonSpecificVersions.join('|')})?.*$`
-  let otpVersionMajor = otpVersion.match(new RegExp(regex))[1]
+  let otpVersion = otpVersion0.replace(/-rc.*/, '')
+  knownBranches.forEach((branch) => {
+    otpVersion = otpVersion.replace(`${branch}-`, '').replace(`${branch}`, '')
+  })
+  // after this we should have either a number-string of an empty string
+  let otpVersionMajor = otpVersion.match(/(\d{1,3}).*/)?.[1] ?? null
 
   const otpSuffix = /-otp-(\d+)/
   const userSuppliedOtp = exSpec0.match(otpSuffix)?.[1] ?? null