Skip to content

Commit

Permalink
Add ref: (version) support to .tool-versions parsing (#228)
Browse files Browse the repository at this point in the history
* Add support elixir ref in .tool-versions

* Make the v in ref:v optional

* Revert and refactor test changes

* Run build-dist
  • Loading branch information
dvic committed Aug 15, 2023
1 parent afb8586 commit f35f714
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10418,11 +10418,11 @@ function parseVersionFile(versionFilePath0) {
// If we ever start parsing something else, this should
// become default in a new option named e.g. version-file-type
versions.split('\n').forEach((line) => {
const appVersion = line.match(/^([^ ]+)[ ]+([^ #]+)/)
const appVersion = line.match(/^([^ ]+)[ ]+(ref:v?)?([^ #]+)/)
if (appVersion) {
const app = appVersion[1]
if (['erlang', 'elixir', 'gleam', 'rebar'].includes(app)) {
const [, , version] = appVersion
const [, , , version] = appVersion
core.info(`Consuming ${app} at version ${version}`)
appVersions.set(app, version)
}
Expand Down
4 changes: 2 additions & 2 deletions src/setup-beam.js
Original file line number Diff line number Diff line change
Expand Up @@ -602,11 +602,11 @@ function parseVersionFile(versionFilePath0) {
// If we ever start parsing something else, this should
// become default in a new option named e.g. version-file-type
versions.split('\n').forEach((line) => {
const appVersion = line.match(/^([^ ]+)[ ]+([^ #]+)/)
const appVersion = line.match(/^([^ ]+)[ ]+(ref:v?)?([^ #]+)/)
if (appVersion) {
const app = appVersion[1]
if (['erlang', 'elixir', 'gleam', 'rebar'].includes(app)) {
const [, , version] = appVersion
const [, , , version] = appVersion
core.info(`Consuming ${app} at version ${version}`)
appVersions.set(app, version)
}
Expand Down
4 changes: 2 additions & 2 deletions test/setup-beam.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,8 @@ async function testParseVersionFile() {
const gleam = '0.23.0'
const rebar3 = '3.16.0'
const toolVersions = `# a comment
erlang ${erlang}# comment, no space
elixir ${elixir} # comment, with space
erlang ref:v${erlang}# comment, no space, and ref:v
elixir ref:${elixir} # comment, with space and ref:
not-gleam 0.23 # not picked up
gleam ${gleam}
rebar ${rebar3}`
Expand Down

0 comments on commit f35f714

Please sign in to comment.