Use ruby-version (#10)
Some checks failed
Main workflow / Run (ubuntu-latest) (push) Has been cancelled
Main workflow / Run (windows-latest) (push) Has been cancelled

This commit is contained in:
Danny McCormick
2019-08-13 16:29:23 -04:00
committed by GitHub
parent 8dd8957526
commit c6c44b217a
4 changed files with 14 additions and 6 deletions

View File

@@ -19,7 +19,7 @@ steps:
- uses: actions/checkout@master - uses: actions/checkout@master
- uses: actions/setup-ruby@v1 - uses: actions/setup-ruby@v1
with: with:
version: '2.x' // Version range or exact version of a Ruby version to use, using semvers version range syntax. ruby-version: '2.x' // Version range or exact version of a Ruby version to use, using semvers version range syntax.
- run: ruby hello.rb - run: ruby hello.rb
``` ```
@@ -37,7 +37,7 @@ jobs:
- name: Setup ruby - name: Setup ruby
uses: actions/setup-ruby@v1 uses: actions/setup-ruby@v1
with: with:
version: ${{ matrix.ruby }} ruby-version: ${{ matrix.ruby }}
architecture: 'x64' architecture: 'x64'
- run: ruby hello.rb - run: ruby hello.rb
``` ```

View File

@@ -2,10 +2,12 @@ name: 'Setup Ruby environment'
description: 'Setup a Ruby environment and add it to the PATH' description: 'Setup a Ruby environment and add it to the PATH'
author: 'GitHub' author: 'GitHub'
inputs: inputs:
version: ruby-version:
description: 'Version range or exact version of a Ruby version to use.' description: 'Version range or exact version of a Ruby version to use.'
default: '>= 2.4' default: '>= 2.4'
# Deprecated option, do not use. Will not be supported after October 1, 2019
version:
description: 'Deprecated. Use ruby-version instead. Will not be supported after October 1, 2019'
runs: runs:
using: 'node12' using: 'node12'
main: 'lib/setup-ruby.js' main: 'lib/setup-ruby.js'

View File

@@ -20,7 +20,10 @@ const installer_1 = require("./installer");
function run() { function run() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
try { try {
const version = core.getInput('version'); let version = core.getInput('version');
if (!version) {
version = core.getInput('ruby-version');
}
yield installer_1.findRubyVersion(version); yield installer_1.findRubyVersion(version);
} }
catch (error) { catch (error) {

View File

@@ -3,7 +3,10 @@ import {findRubyVersion} from './installer';
async function run() { async function run() {
try { try {
const version = core.getInput('version'); let version = core.getInput('version');
if (!version) {
version = core.getInput('ruby-version');
}
await findRubyVersion(version); await findRubyVersion(version);
} catch (error) { } catch (error) {
core.setFailed(error.message); core.setFailed(error.message);