Allow version-type: strict + otp-version: master for Elixir -based builds #144
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,13 @@ jobs: | |
| fail-fast: false | ||
| matrix: | ||
| combo: | ||
| - otp-version: 'master' | ||
| elixir-version: '1.14.0' | ||
| os: 'ubuntu-latest' | ||
| - otp-version: 'master' | ||
| elixir-version: '1.14.0' | ||
| os: 'ubuntu-latest' | ||
| version-type: 'strict' | ||
| - otp-version: '25' | ||
| elixir-version: '1' | ||
| rebar3-version: '3' | ||
|
|
@@ -113,12 +120,13 @@ jobs: | |
| - elixir-version: 'master' | ||
| otp-version: '23.1' | ||
| os: 'ubuntu-20.04' | ||
| - elixir-version: 'main' | ||
|
There was a problem hiding this comment. This was actually a fix. Since OTP 25, Elixir no longer has |
||
| otp-version: '25' | ||
| os: 'ubuntu-20.04' | ||
| version-type: 'strict' | ||
| - gleam-version: 'nightly' | ||
| otp-version: '24' | ||
| os: 'ubuntu-latest' | ||
|
There was a problem hiding this comment. I believe this should've been broken, but can't understand how we didn't see it before. In any case, on the README, the Ubuntu build is broken and there were recently issues with running actions on GitHub actions like so, which was hiding bugs. |
||
| - gleam-version: '0.23' | ||
| otp-version: '24' | ||
| os: 'ubuntu-latest' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7189,8 +7189,8 @@ async function main() { | |
| const rebar3Spec = core.getInput('rebar3-version', { required: false }) | ||
|
|
||
| if (otpSpec !== 'false') { | ||
|
There was a problem hiding this comment. We install Elixir based on the direct OTP input, and not the output of this function (easier to reason about)... |
||
| await installOTP(otpSpec, osVersion) | ||
| const elixirInstalled = await maybeInstallElixir(elixirSpec, otpSpec) | ||
|
|
||
| if (elixirInstalled === true) { | ||
| const shouldMixRebar = core.getInput('install-rebar', { | ||
|
|
@@ -7300,19 +7300,13 @@ async function maybeInstallRebar3(rebar3Spec) { | |
|
|
||
| async function getOTPVersion(otpSpec0, osVersion) { | ||
| const otpVersions = await getOTPVersions(osVersion) | ||
| let otpSpec = otpSpec0 // might be a branch (?) | ||
|
There was a problem hiding this comment. Greatly simplified. We drop OTP-, maint- and whatnot to favour "branch over version," as suggested by @ericmj. |
||
| const otpVersion = getVersionFromSpec( | ||
| otpSpec, | ||
| Array.from(otpVersions.keys()).sort(), | ||
| ) | ||
| if (isVersion(otpSpec0)) { | ||
| otpSpec = `OTP-${otpSpec0}` // ... it's a version! | ||
| } | ||
| if (otpVersion === null) { | ||
| throw new Error( | ||
|
|
@@ -7324,60 +7318,46 @@ async function getOTPVersion(otpSpec0, osVersion) { | |
| return otpVersions.get(otpVersion) // from the reference, for download | ||
| } | ||
|
|
||
| async function getElixirVersion(exSpec0, otpVersion0) { | ||
|
There was a problem hiding this comment. Also greatly simplified as per previous explanation. |
||
| const otpVersion = otpVersion0.match(/^([^-]+-)?(.+)$/)[2] | ||
| const otpVersionMajor = otpVersion.match(/^([^.]+).*$/)[1] | ||
| const elixirVersions = await getElixirVersions() | ||
| const semverVersions = Array.from(elixirVersions.keys()).sort() | ||
| const exSpec = exSpec0.replace(/-otp-.*$/, '') | ||
| const elixirVersionFromSpec = getVersionFromSpec(exSpec, semverVersions, true) | ||
| let elixirVersionForDownload = elixirVersionFromSpec | ||
| if (isVersion(otpVersionMajor)) { | ||
| elixirVersionForDownload = `${elixirVersionFromSpec}-otp-${otpVersionMajor}` | ||
| } | ||
| if (elixirVersionFromSpec === null) { | ||
| throw new Error( | ||
| `Requested Elixir version (${exSpec0}) not found in version list ` + | ||
| "(should you be using option 'version-type': 'strict'?)", | ||
| ) | ||
| } | ||
|
|
||
| const elixirVersionComp = elixirVersions.get(elixirVersionFromSpec) | ||
| if ( | ||
| (elixirVersionComp && elixirVersionComp.includes(otpVersionMajor)) || | ||
| !isVersion(otpVersionMajor) | ||
| ) { | ||
| core.info( | ||
| `Using Elixir ${elixirVersionFromSpec} (built for Erlang/OTP ${otpVersionMajor})`, | ||
| ) | ||
| } else { | ||
| throw new Error( | ||
| `Requested Elixir / Erlang/OTP version (${exSpec0} / ${otpVersion0}) not ` + | ||
| 'found in version list (did you check Compatibility between Elixir and Erlang/OTP?)', | ||
| ) | ||
| } | ||
|
|
||
| return maybePrependWithV(elixirVersionForDownload) | ||
| } | ||
|
|
||
| async function getGleamVersion(gleamSpec0) { | ||
| const gleamSpec = gleamSpec0.match(/^v?(.+)$/) | ||
| const gleamVersions = await getGleamVersions() | ||
| const gleamVersion = getVersionFromSpec(gleamSpec[1], gleamVersions, true) | ||
| if (gleamVersion === null) { | ||
| throw new Error( | ||
| `Requested Gleam version (${gleamSpec0}) not found in version list ` + | ||
|
|
@@ -7421,7 +7401,9 @@ async function getOTPVersions(osVersion) { | |
| .trim() | ||
| .split('\n') | ||
| .forEach((line) => { | ||
| const otpMatch = line | ||
| .match(/^([^ ]+)?( .+)/)[1] | ||
| .match(/^([^-]+-)?(.+)$/) | ||
| const otpVersion = otpMatch[2] | ||
| otpVersions.set(otpVersion, otpMatch[0]) // we keep the original for later reference | ||
| }) | ||
|
|
@@ -7438,7 +7420,6 @@ async function getOTPVersions(osVersion) { | |
| }) | ||
| }) | ||
| } | ||
|
There was a problem hiding this comment. Unintended... |
||
| return otpVersions | ||
| } | ||
|
|
||
|
|
@@ -7455,7 +7436,7 @@ async function getElixirVersions() { | |
| .forEach((line) => { | ||
| const elixirMatch = | ||
| line.match(/^v?(.+)-otp-([^ ]+)/) || line.match(/^v?([^ ]+)/) | ||
| const elixirVersion = maybePrependWithV(elixirMatch[1]) | ||
| const otpVersion = elixirMatch[2] | ||
| const otpVersions = otpVersionsForElixirMap.get(elixirVersion) || [] | ||
| if (otpVersion) { | ||
|
|
@@ -7502,7 +7483,7 @@ function isStrictVersion() { | |
| return core.getInput('version-type', { required: false }) === 'strict' | ||
| } | ||
|
|
||
| function getVersionFromSpec(spec, versions, maybePrependWithV0) { | ||
| let version = null | ||
|
|
||
| if (spec.match(/rc/) || isStrictVersion()) { | ||
|
|
@@ -7527,7 +7508,11 @@ function getVersionFromSpec(spec, versions) { | |
| } | ||
| } | ||
|
|
||
| let v = version === null || version === undefined ? null : version | ||
| if (maybePrependWithV0 && v != null) { | ||
| v = maybePrependWithV(v) | ||
| } | ||
| return v | ||
| } | ||
|
|
||
| function maybeCoerced(v) { | ||
|
|
@@ -7634,15 +7619,17 @@ async function get(url0, pageIdxs) { | |
| return ret | ||
| } | ||
|
|
||
| function maybePrependWithV(v) { | ||
| if (isVersion(v)) { | ||
| return `v${v.replace('v', '')}` | ||
| } | ||
| return v | ||
| } | ||
|
|
||
| function isVersion(v) { | ||
| return /^v?\d+/.test(v) | ||
| } | ||
|
|
||
| module.exports = { | ||
| getOTPVersion, | ||
| getElixirVersion, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added as part of the "was failing, but shouldn't!" testbed.