From 3622b49cddc2542ce54af46056d0a64f22961deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20Meadows-J=C3=B6nsson?= Date: Tue, 12 Jan 2021 00:49:46 +0000 Subject: [PATCH] Remove experimental-otp --- action.yml | 3 --- src/setup-elixir.js | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/action.yml b/action.yml index ec34bd5..b9444df 100644 --- a/action.yml +++ b/action.yml @@ -9,9 +9,6 @@ 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 diff --git a/src/setup-elixir.js b/src/setup-elixir.js index c1046c4..5be183b 100644 --- a/src/setup-elixir.js +++ b/src/setup-elixir.js @@ -30,9 +30,7 @@ async function main() { let installRebar = core.getInput('install-rebar') installRebar = installRebar == null ? 'true' : installRebar - const experimentalOTP = core.getInput('experimental-otp') - const osVersion = - experimentalOTP === 'true' ? getRunnerOSVersion() : 'ubuntu-14.04' + const osVersion = getRunnerOSVersion() console.log(`##[group]Installing OTP ${otpVersion} - built on ${osVersion}`) await installOTP(otpVersion, osVersion) @@ -65,7 +63,7 @@ async function getOtpVersion(spec) { return getVersionFromSpec(spec, await getOtpVersions()) || spec } -function getRunnerOSVersion(experimentalOTP) { +function getRunnerOSVersion() { const mapToUbuntuVersion = { ubuntu16: 'ubuntu-16.04', ubuntu18: 'ubuntu-18.04',