Merge pull request #46 from deniskulicek/parametrize-otp-os-version

Fetch OTP release based on ImageOS environment variable
This commit is contained in:
Jonathan Clem
2020-11-17 08:26:49 -05:00
committed by GitHub
6 changed files with 45 additions and 10 deletions

View File

@@ -9,6 +9,9 @@ inputs:
description: Version range or exact version of Elixir to use
otp-version:
description: Version range or exact version of OTP to use
experimental-otp:
description: Whether to use experimental builds of OTP (images that have not yet been fully tested include ubuntu-16.04, ubuntu-18.04, ubuntu-20.04)
default: false
install-hex:
description: Whether to install Hex
default: true

24
dist/index.js vendored
View File

@@ -2955,9 +2955,9 @@ async function installElixir(version, otpMajor) {
*
* @param {string} version
*/
async function installOTP(version) {
async function installOTP(version, osVersion) {
if (process.platform === 'linux') {
await exec(__webpack_require__.ab + "install-otp", [version])
await exec(__webpack_require__.ab + "install-otp", [version, osVersion])
return
}
@@ -3324,11 +3324,16 @@ async function main() {
let installHex = core.getInput('install-hex')
installHex = installHex == null ? 'true' : installHex
let installRebar = core.getInput('install-rebar')
installRebar = installRebar == null ? 'true' : installRebar
console.log(`##[group]Installing OTP ${otpVersion}`)
await installOTP(otpVersion)
const experimentalOTP = core.getInput('experimental-otp')
const osVersion =
experimentalOTP === 'true' ? getRunnerOSVersion() : 'ubuntu-14.04'
console.log(`##[group]Installing OTP ${otpVersion} - built on ${osVersion}`)
await installOTP(otpVersion, osVersion)
console.log(`##[endgroup]`)
console.log(`##[group]Installing Elixir ${elixirVersion}`)
@@ -3344,6 +3349,7 @@ async function main() {
console.log(`##[add-matcher]${path.join(matchersPath, 'elixir.json')}`)
core.setOutput('otp-version', otpVersion)
core.setOutput('elixir-version', elixirVersion)
core.setOutput('osVersion', osVersion)
}
function checkPlatform() {
@@ -3357,6 +3363,16 @@ async function getOtpVersion(spec) {
return getVersionFromSpec(spec, await getOtpVersions()) || spec
}
function getRunnerOSVersion(experimentalOTP) {
const mapToUbuntuVersion = {
ubuntu16: 'ubuntu-16.04',
ubuntu18: 'ubuntu-18.04',
ubuntu20: 'ubuntu-20.04',
}
return mapToUbuntuVersion[process.env.ImageOS] || 'ubuntu-18.04'
}
exports.getElixirVersion = getElixirVersion
async function getElixirVersion(spec, otpVersion) {

2
dist/install-otp vendored
View File

@@ -4,7 +4,7 @@ set -eo pipefail
cd $RUNNER_TEMP
wget -q -O otp.tar.gz https://repo.hex.pm/builds/otp/ubuntu-14.04/OTP-${1}.tar.gz
wget -q -O otp.tar.gz https://repo.hex.pm/builds/otp/${2}/OTP-${1}.tar.gz
mkdir -p .setup-elixir/otp
tar zxf otp.tar.gz -C .setup-elixir/otp --strip-components=1
rm otp.tar.gz

View File

@@ -4,7 +4,7 @@ set -eo pipefail
cd $RUNNER_TEMP
wget -q -O otp.tar.gz https://repo.hex.pm/builds/otp/ubuntu-14.04/OTP-${1}.tar.gz
wget -q -O otp.tar.gz https://repo.hex.pm/builds/otp/${2}/OTP-${1}.tar.gz
mkdir -p .setup-elixir/otp
tar zxf otp.tar.gz -C .setup-elixir/otp --strip-components=1
rm otp.tar.gz

View File

@@ -22,9 +22,9 @@ async function installElixir(version, otpMajor) {
*
* @param {string} version
*/
async function installOTP(version) {
async function installOTP(version, osVersion) {
if (process.platform === 'linux') {
await exec(path.join(__dirname, 'install-otp'), [version])
await exec(path.join(__dirname, 'install-otp'), [version, osVersion])
return
}

View File

@@ -26,11 +26,16 @@ async function main() {
let installHex = core.getInput('install-hex')
installHex = installHex == null ? 'true' : installHex
let installRebar = core.getInput('install-rebar')
installRebar = installRebar == null ? 'true' : installRebar
console.log(`##[group]Installing OTP ${otpVersion}`)
await installOTP(otpVersion)
const experimentalOTP = core.getInput('experimental-otp')
const osVersion =
experimentalOTP === 'true' ? getRunnerOSVersion() : 'ubuntu-14.04'
console.log(`##[group]Installing OTP ${otpVersion} - built on ${osVersion}`)
await installOTP(otpVersion, osVersion)
console.log(`##[endgroup]`)
console.log(`##[group]Installing Elixir ${elixirVersion}`)
@@ -46,6 +51,7 @@ async function main() {
console.log(`##[add-matcher]${path.join(matchersPath, 'elixir.json')}`)
core.setOutput('otp-version', otpVersion)
core.setOutput('elixir-version', elixirVersion)
core.setOutput('osVersion', osVersion)
}
function checkPlatform() {
@@ -59,6 +65,16 @@ async function getOtpVersion(spec) {
return getVersionFromSpec(spec, await getOtpVersions()) || spec
}
function getRunnerOSVersion(experimentalOTP) {
const mapToUbuntuVersion = {
ubuntu16: 'ubuntu-16.04',
ubuntu18: 'ubuntu-18.04',
ubuntu20: 'ubuntu-20.04',
}
return mapToUbuntuVersion[process.env.ImageOS] || 'ubuntu-18.04'
}
exports.getElixirVersion = getElixirVersion
async function getElixirVersion(spec, otpVersion) {