Improve on "Add Windows to the mix" (#52)

* Support more OTP+Windows versions (try to bridge the gap with gleam-lang/setup-erlang that seems to support pre-21 versions)
* Merge ci.yml and test.yml
* Add Elixir to the Windows mix
* Hopefully improve error/warning messages
* Adapt the doc.s to the current reality
* Add option version-type (loose by default, for compatibility)

dist/index.js

@@ -4599,7 +4599,7 @@ async function installOTP(osVersion, otpVersion) {
     await exec(__nccwpck_require__.ab + "install-otp.sh", [osVersion, otpVersion])
   } else if (OS === 'win32') {
     const script = __nccwpck_require__.ab + "install-otp.ps1"
-    await exec(`powershell.exe ${script} -VSN:${otpVersion}`)
+    await exec(`pwsh.exe ${script} -VSN:${otpVersion}`)
   }
 }
 
@@ -4614,7 +4614,7 @@ async function installElixir(elixirVersion) {
     await exec(__nccwpck_require__.ab + "install-elixir.sh", [elixirVersion])
   } else if (OS === 'win32') {
     const script = __nccwpck_require__.ab + "install-elixir.ps1"
-    await exec(`powershell.exe ${script} ${elixirVersion}`)
+    await exec(`pwsh.exe ${script} -VSN:${elixirVersion}`)
   }
 }
 
@@ -4629,7 +4629,7 @@ async function installRebar3(rebar3Version) {
     await exec(__nccwpck_require__.ab + "install-rebar3.sh", [rebar3Version])
   } else if (OS === 'win32') {
     const script = __nccwpck_require__.ab + "install-rebar3.ps1"
-    await exec(`powershell.exe ${script} -VSN:${rebar3Version}`)
+    await exec(`pwsh.exe ${script} -VSN:${rebar3Version}`)
   }
 }
 
@@ -4659,6 +4659,7 @@ const { exec } = __nccwpck_require__(1514)
 const path = __nccwpck_require__(5622)
 const semver = __nccwpck_require__(1383)
 const https = __nccwpck_require__(7211)
+const fs = __nccwpck_require__(5747)
 const installer = __nccwpck_require__(2127)
 
 main().catch((err) => {
@@ -4673,19 +4674,15 @@ async function main() {
   const otpVersion = await installOTP(otpSpec, osVersion)
 
   const elixirSpec = core.getInput('elixir-version', { required: false })
-  const shouldMixHex = core.getInput('install-hex', {
-    required: false,
-  })
-  const elixirInstalled = await maybeInstallElixir(
-    elixirSpec,
-    otpVersion,
-    shouldMixHex,
-  )
+  const elixirInstalled = await maybeInstallElixir(elixirSpec, otpVersion)
   if (elixirInstalled === true) {
     const shouldMixRebar = core.getInput('install-rebar', {
       required: false,
     })
     await mix(shouldMixRebar, 'rebar')
+    const shouldMixHex = core.getInput('install-hex', {
+      required: false,
+    })
     await mix(shouldMixHex, 'hex')
   }
 
@@ -4701,16 +4698,22 @@ async function installOTP(otpSpec, osVersion) {
   await installer.installOTP(osVersion, otpVersion)
   core.setOutput('otp-version', otpVersion)
   if (process.platform === 'linux') {
-    prependToPath(`${process.env.RUNNER_TEMP}/.setup-beam/otp/bin`)
+    core.addPath(`${process.env.RUNNER_TEMP}/.setup-beam/otp/bin`)
   } else if (process.platform === 'win32') {
-    prependToPath(`C:/Program Files/erl-${otpVersion}/bin`)
+    const otpPath = fs.readFileSync(`${process.env.RUNNER_TEMP}/otp_path.txt`, {
+      encoding: 'utf8',
+      flag: 'r',
+    })
+    core.addPath(otpPath)
   }
   console.log('##[endgroup]')
 
   return otpVersion
 }
 
-async function maybeInstallElixir(elixirSpec, otpVersion, shouldMixHex) {
+async function maybeInstallElixir(elixirSpec, otpVersion) {
+  let installed = false
+
   if (elixirSpec) {
     const elixirVersion = await getElixirVersion(elixirSpec, otpVersion)
     console.log(`##[group]Installing Elixir ${elixirVersion}`)
@@ -4720,19 +4723,13 @@ async function maybeInstallElixir(elixirSpec, otpVersion, shouldMixHex) {
     console.log(
       `##[add-matcher]${path.join(matchersPath, 'elixir-matchers.json')}`,
     )
-    prependToPath(`${process.env.RUNNER_TEMP}/.setup-beam/elixir/bin`)
+    core.addPath(`${process.env.RUNNER_TEMP}/.setup-beam/elixir/bin`)
     console.log('##[endgroup]')
 
-    return true
+    installed = true
   }
 
-  if (shouldMixHex) {
-    console.log(
-      "hex will not be installed (overriding default) since Elixir wasn't either",
-    )
-  }
-
-  return false
+  return installed
 }
 
 async function mix(shouldMix, what) {
@@ -4746,18 +4743,20 @@ async function mix(shouldMix, what) {
 }
 
 async function maybeInstallRebar3(rebar3Spec) {
+  let installed = false
+
   if (rebar3Spec) {
     const rebar3Version = await getRebar3Version(rebar3Spec)
     console.log(`##[group]Installing rebar3 ${rebar3Version}`)
     await installer.installRebar3(rebar3Version)
     core.setOutput('rebar3-version', rebar3Version)
-    prependToPath(`${process.env.RUNNER_TEMP}/.setup-beam/rebar3/bin`)
+    core.addPath(`${process.env.RUNNER_TEMP}/.setup-beam/rebar3/bin`)
     console.log('##[endgroup]')
 
-    return true
+    installed = true
   }
 
-  return false
+  return installed
 }
 
 async function getOTPVersion(otpSpec0, osVersion) {
@@ -4766,7 +4765,7 @@ async function getOTPVersion(otpSpec0, osVersion) {
   let otpVersion
   if (otpSpec[1]) {
     throw new Error(
-      `Requested Erlang/OTP version (from spec ${otpSpec0}) ` +
+      `Requested Erlang/OTP version (${otpSpec0}) ` +
         "should not contain 'OTP-'",
     )
   }
@@ -4778,7 +4777,7 @@ async function getOTPVersion(otpSpec0, osVersion) {
   }
   if (otpVersion === null) {
     throw new Error(
-      `Requested Erlang/OTP version (from spec ${otpSpec0}) not found in build listing`,
+      `Requested Erlang/OTP version (${otpSpec0}) not found in version list`,
     )
   }
 
@@ -4793,7 +4792,7 @@ async function getElixirVersion(exSpec0, otpVersion) {
   let elixirVersion
   if (exSpec[2]) {
     throw new Error(
-      `Requested Elixir / Erlang/OTP version (from spec ${exSpec0} / ${otpVersion}) ` +
+      `Requested Elixir / Erlang/OTP version (${exSpec0} / ${otpVersion}) ` +
         "should not contain '-otp-...'",
     )
   }
@@ -4802,7 +4801,7 @@ async function getElixirVersion(exSpec0, otpVersion) {
   }
   if (!exSpec || elixirVersion === null) {
     throw new Error(
-      `Requested Elixir version (from spec ${exSpec0}) not found in build listing`,
+      `Requested Elixir version (${exSpec0}) not found in version list`,
     )
   }
   const otpMatch = otpVersion.match(/^(?:OTP-)?([^.]+)/)
@@ -4824,8 +4823,8 @@ async function getElixirVersion(exSpec0, otpVersion) {
     }
   } else {
     throw new Error(
-      `Requested Elixir / Erlang/OTP version (from spec ${exSpec0} / ${otpVersion}) not ` +
-        'found in build listing',
+      `Requested Elixir / Erlang/OTP version (${exSpec0} / ${otpVersion}) not ` +
+        'found in version list',
     )
   }
 
@@ -4837,7 +4836,7 @@ async function getRebar3Version(r3Spec) {
   const rebar3Version = getVersionFromSpec(r3Spec, rebar3Versions)
   if (rebar3Version === null) {
     throw new Error(
-      `Requested rebar3 version (from spec ${r3Spec}) not found in build listing`,
+      `Requested rebar3 version (${r3Spec}) not found in version list`,
     )
   }
 
@@ -4865,11 +4864,7 @@ async function getOTPVersions(osVersion) {
       .split('\n')
       .forEach((line) => {
         const otpMatch = line.match(/^(OTP-)?([^ ]+)/)
-
-        let otpVersion = otpMatch[2]
-        if (semver.validRange(otpVersion) && hasPatch(otpVersion)) {
-          otpVersion = semver.minVersion(otpVersion).version
-        }
+        const otpVersion = otpMatch[2]
         otpVersions.set(otpVersion, otpMatch[0]) // we keep the original for later reference
       })
   } else if (process.platform === 'win32') {
@@ -4880,10 +4875,7 @@ async function getOTPVersions(osVersion) {
         .filter((x) => x.name.match(/^otp_win64_.*.exe$/))
         .forEach((x) => {
           const otpMatch = x.name.match(/^otp_win64_(.*).exe$/)
-          let otpVersion = otpMatch[1]
-          if (semver.validRange(otpVersion) && hasPatch(otpVersion)) {
-            otpVersion = semver.minVersion(otpVersion).version
-          }
+          const otpVersion = otpMatch[1]
           otpVersions.set(otpVersion, otpVersion)
         })
     })
@@ -4934,11 +4926,54 @@ async function getRebar3Versions() {
 }
 
 function getVersionFromSpec(spec, versions) {
-  if (versions.includes(spec)) {
-    return spec
+  let version = null
+
+  if (core.getInput('version-type', { required: false }) === 'strict') {
+    version = spec
   }
 
-  return semver.maxSatisfying(versions, semver.validRange(spec))
+  if (version === null) {
+    // We keep a map of semver => "spec" in order to use semver ranges to find appropriate versions
+    const versionsMap = versions.sort(sortVersions).reduce((acc, v) => {
+      try {
+        acc[semver.coerce(v).version] = v
+      } catch {
+        // some stuff can't be coerced, like 'master'
+        acc[v] = v
+      }
+      return acc
+    }, {})
+    const rangeForMax = semver.validRange(spec)
+    if (rangeForMax) {
+      version =
+        versionsMap[semver.maxSatisfying(Object.keys(versionsMap), rangeForMax)]
+    } else {
+      version = versionsMap[spec]
+    }
+  }
+
+  return version
+}
+
+function sortVersions(left, right) {
+  let ret = 0
+  const newL = verAsComparableStr(left)
+  const newR = verAsComparableStr(right)
+
+  function verAsComparableStr(ver) {
+    const matchGroups = 5
+    const verSpec = /([^.]+)?\.?([^.]+)?\.?([^.]+)?\.?([^.]+)?\.?([^.]+)?/
+    const matches = ver.match(verSpec).splice(1, matchGroups)
+    return matches.reduce((acc, v) => acc + (v || '0').padStart(3, '0'), '')
+  }
+
+  if (newL < newR) {
+    ret = -1
+  } else if (newL > newR) {
+    ret = 1
+  }
+
+  return ret
 }
 
 function getRunnerOSVersion() {
@@ -4998,27 +5033,11 @@ async function get(url0, pageIdxs) {
   return ret
 }
 
-function prependToPath(what) {
-  if (process.platform === 'linux') {
-    process.env.PATH = `${what}:${process.env.PATH}`
-  } else if (process.platform === 'win32') {
-    process.env.PATH = `${what};${process.env.PATH}`
-  }
-}
-
-function hasPatch(v) {
-  try {
-    semver.patch(v)
-  } catch {
-    return false
-  }
-
-  return true
-}
 module.exports = {
   getOTPVersion,
   getElixirVersion,
   getRebar3Version,
+  getVersionFromSpec,
 }
 
 

dist/install-elixir.ps1

@@ -1,5 +1,19 @@
-Write-Output "Installer for Elixir for Windows not available"
+param([Parameter(Mandatory=$true)][string]$VSN)
 
 $ErrorActionPreference="Stop"
 
-Exit 1
+Set-Location $Env:RUNNER_TEMP
+
+$FILE_INPUT="${VSN}.zip"
+$FILE_OUTPUT="elixir.zip"
+$DIR_FOR_BIN=".setup-beam/elixir"
+
+$ProgressPreference="SilentlyContinue"
+Invoke-WebRequest "https://repo.hex.pm/builds/elixir/${FILE_INPUT}" -OutFile "$FILE_OUTPUT"
+$ProgressPreference="Continue"
+New-Item "$DIR_FOR_BIN" -ItemType Directory | Out-Null
+$ProgressPreference="SilentlyContinue"
+Expand-Archive -DestinationPath "${DIR_FOR_BIN}" -Path "${FILE_OUTPUT}"
+$ProgressPreference="Continue"
+Write-Output "Installed Erlang/OTP version follows"
+& "$DIR_FOR_BIN/bin/iex" "-v" | Write-Output

dist/install-elixir.sh

@@ -9,12 +9,8 @@ FILE_INPUT="${VSN}.zip"
 FILE_OUTPUT=elixir.zip
 DIR_FOR_BIN=.setup-beam/elixir
 
-rm -f "${FILE_OUTPUT}"
-rm -rf "${DIR_FOR_BIN}"
 wget -q -O "${FILE_OUTPUT}" "https://repo.hex.pm/builds/elixir/${FILE_INPUT}"
 mkdir -p "${DIR_FOR_BIN}"
 unzip -q -d "${DIR_FOR_BIN}" "${FILE_OUTPUT}"
-rm -f "${FILE_OUTPUT}"
-echo "$(pwd)/${DIR_FOR_BIN}/bin" >> "$GITHUB_PATH"
 echo "Installed Elixir version follows"
 ${DIR_FOR_BIN}/bin/iex -v

dist/install-otp.ps1

@@ -7,13 +7,14 @@ Set-Location $Env:RUNNER_TEMP
 $FILE_OUTPUT="otp.exe"
 $DIR_FOR_BIN=".setup-beam/otp"
 
-Remove-Item -Recurse -Force "$DIR_FOR_BIN" -ErrorAction SilentlyContinue
 $ProgressPreference="SilentlyContinue"
 Invoke-WebRequest "https://github.com/erlang/otp/releases/download/OTP-$VSN/otp_win64_$VSN.exe" -OutFile "$FILE_OUTPUT"
 $ProgressPreference="Continue"
 New-Item "$DIR_FOR_BIN" -ItemType Directory | Out-Null
 Move-Item "$FILE_OUTPUT" "$DIR_FOR_BIN"
 Start-Process "./$DIR_FOR_BIN/$FILE_OUTPUT" /S -Wait
-Write-Output "C:/Program Files/erl-$VSN/bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
+$ErlExec = Get-ChildItem -Path "C:/Program Files/" -Recurse -Depth 2 -Filter 'erl.exe' -Name | ForEach-Object { Write-Output "C:/Program Files/$_" }
+$ErlPath = Split-Path -Path "$ErlExec"
+Write-Output "$ErlPath" | Out-File -FilePath otp_path.txt -Encoding utf8 -NoNewline
 Write-Output "Installed Erlang/OTP version follows"
-& "C:/Program Files/erl-$VSN/bin/erl.exe" "+V" | Write-Output
+& "$ErlPath/erl.exe" "+V" | Write-Output

dist/install-otp.sh

@@ -10,13 +10,9 @@ FILE_INPUT="${VSN}.tar.gz"
 FILE_OUTPUT=otp.tar.gz
 DIR_FOR_BIN=.setup-beam/otp
 
-rm -f "${FILE_OUTPUT}"
-rm -rf "${DIR_FOR_BIN}"
 wget -q -O "${FILE_OUTPUT}" "https://repo.hex.pm/builds/otp/${OS}/${FILE_INPUT}"
 mkdir -p "${DIR_FOR_BIN}"
 tar zxf "${FILE_OUTPUT}" -C "${DIR_FOR_BIN}" --strip-components=1
-rm -f "${FILE_OUTPUT}"
 "${DIR_FOR_BIN}/Install" -minimal "$(pwd)/${DIR_FOR_BIN}"
-echo "$(pwd)/${DIR_FOR_BIN}/bin" >> "$GITHUB_PATH"
 echo "Installed Erlang/OTP version follows"
 ${DIR_FOR_BIN}/bin/erl -version

dist/install-rebar3.ps1

@@ -9,8 +9,6 @@ $FILE_OUTPUT="rebar3"
 $FILE_OUTPUT_PS1="rebar3.ps1"
 $DIR_FOR_BIN=".setup-beam/rebar3"
 
-Remove-Item -Force "$FILE_OUTPUT" -ErrorAction SilentlyContinue
-Remove-Item -Recurse -Force "$DIR_FOR_BIN" -ErrorAction SilentlyContinue
 $ProgressPreference="SilentlyContinue"
 Invoke-WebRequest "https://github.com/erlang/rebar3/releases/download/${VSN}/${FILE_INPUT}" -OutFile "$FILE_OUTPUT"
 $ProgressPreference="Continue"
@@ -19,6 +17,5 @@ Move-Item "$FILE_OUTPUT" "$DIR_FOR_BIN/bin"
 Write-Output "& escript.exe $PWD/$DIR_FOR_BIN/bin/$FILE_OUTPUT `$args" | Out-File -FilePath "$FILE_OUTPUT_PS1" -Encoding utf8 -Append
 type $FILE_OUTPUT_PS1
 Move-Item "$FILE_OUTPUT_PS1" "$DIR_FOR_BIN/bin"
-Write-Output "$PWD/$DIR_FOR_BIN/bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
 Write-Output "Installed rebar3 version follows"
 & "$DIR_FOR_BIN/bin/rebar3" "version" | Write-Output

dist/install-rebar3.sh

@@ -9,12 +9,9 @@ FILE_INPUT=rebar3
 FILE_OUTPUT=rebar3
 DIR_FOR_BIN=.setup-beam/rebar3
 
-rm -f "${FILE_OUTPUT}"
-rm -rf "${DIR_FOR_BIN}"
 wget -q -O "${FILE_OUTPUT}" "https://github.com/erlang/rebar3/releases/download/${VSN}/${FILE_INPUT}"
 mkdir -p "${DIR_FOR_BIN}/bin"
 chmod +x "${FILE_OUTPUT}"
 mv "${FILE_OUTPUT}" "${DIR_FOR_BIN}/bin"
-echo "$(pwd)/${DIR_FOR_BIN}/bin" >> "$GITHUB_PATH"
 echo "Installed rebar3 version follows"
 ${DIR_FOR_BIN}/bin/rebar3 version