mirror of
https://github.com/erlef/setup-beam.git
synced 2026-07-23 07:06:07 +00:00
Fix post -main-merge issue (#213)
This commit is contained in:
committed by
GitHub
parent
df9a60921b
commit
5a810ba0ce
Vendored
+4
-3
@@ -9750,7 +9750,7 @@ async function installOTP(osVersion, otpVersion, hexMirrors) {
|
||||
core.addPath(otpPath)
|
||||
core.exportVariable('INSTALL_DIR_FOR_OTP', cachedPath)
|
||||
|
||||
console.log('Installed Erlang/OTP version')
|
||||
core.info('Installed Erlang/OTP version')
|
||||
await exec(path.join(otpPath, 'erl'), ['-version'])
|
||||
} else if (OS === 'win32') {
|
||||
if (!cachedPath) {
|
||||
@@ -9770,7 +9770,7 @@ async function installOTP(osVersion, otpVersion, hexMirrors) {
|
||||
core.addPath(otpPath)
|
||||
core.exportVariable('INSTALL_DIR_FOR_OTP', otpDir)
|
||||
|
||||
console.log('Installed Erlang/OTP version')
|
||||
core.info('Installed Erlang/OTP version')
|
||||
await exec(path.join(otpPath, 'erl'), ['+V'])
|
||||
}
|
||||
} catch (err) {
|
||||
@@ -10082,7 +10082,8 @@ async function getElixirVersion(exSpec0, otpVersion0, hexMirrors) {
|
||||
throw new Error(
|
||||
`Requested Elixir / Erlang/OTP version (${exSpec0} / ${otpVersion0}) not ` +
|
||||
'found in version list (did you check Compatibility between Elixir and Erlang/OTP?).' +
|
||||
'Elixir and Erlang/OTP compatibility can be found at: https://hexdocs.pm/elixir/compatibility-and-deprecations.html',
|
||||
'Elixir and Erlang/OTP compatibility can be found at: ' +
|
||||
'https://hexdocs.pm/elixir/compatibility-and-deprecations.html',
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -44,7 +44,7 @@ async function installOTP(osVersion, otpVersion, hexMirrors) {
|
||||
core.addPath(otpPath)
|
||||
core.exportVariable('INSTALL_DIR_FOR_OTP', cachedPath)
|
||||
|
||||
console.log('Installed Erlang/OTP version')
|
||||
core.info('Installed Erlang/OTP version')
|
||||
await exec(path.join(otpPath, 'erl'), ['-version'])
|
||||
} else if (OS === 'win32') {
|
||||
if (!cachedPath) {
|
||||
@@ -64,7 +64,7 @@ async function installOTP(osVersion, otpVersion, hexMirrors) {
|
||||
core.addPath(otpPath)
|
||||
core.exportVariable('INSTALL_DIR_FOR_OTP', otpDir)
|
||||
|
||||
console.log('Installed Erlang/OTP version')
|
||||
core.info('Installed Erlang/OTP version')
|
||||
await exec(path.join(otpPath, 'erl'), ['+V'])
|
||||
}
|
||||
} catch (err) {
|
||||
|
||||
+2
-1
@@ -210,7 +210,8 @@ async function getElixirVersion(exSpec0, otpVersion0, hexMirrors) {
|
||||
throw new Error(
|
||||
`Requested Elixir / Erlang/OTP version (${exSpec0} / ${otpVersion0}) not ` +
|
||||
'found in version list (did you check Compatibility between Elixir and Erlang/OTP?).' +
|
||||
'Elixir and Erlang/OTP compatibility can be found on: https://hexdocs.pm/elixir/compatibility-and-deprecations.html',
|
||||
'Elixir and Erlang/OTP compatibility can be found at: ' +
|
||||
'https://hexdocs.pm/elixir/compatibility-and-deprecations.html',
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user