PR Feedback - simplifying action
This commit is contained in:
@@ -5,9 +5,6 @@ inputs:
|
|||||||
version:
|
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'
|
||||||
add-to-path:
|
|
||||||
description: 'Prepend the retrieved Ruby version to the PATH environment variable to make it available in subsequent actions or scripts without using the output variable.'
|
|
||||||
default: 'true'
|
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: 'node'
|
using: 'node'
|
||||||
|
|||||||
@@ -15,47 +15,24 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
Object.defineProperty(exports, "__esModule", { value: true });
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
const core = __importStar(require("@actions/core"));
|
|
||||||
const exec = __importStar(require("@actions/exec"));
|
const exec = __importStar(require("@actions/exec"));
|
||||||
const tc = __importStar(require("@actions/tool-cache"));
|
const tc = __importStar(require("@actions/tool-cache"));
|
||||||
const os = __importStar(require("os"));
|
|
||||||
const path = __importStar(require("path"));
|
const path = __importStar(require("path"));
|
||||||
var Platform;
|
const IS_WINDOWS = process.platform === 'win32';
|
||||||
(function (Platform) {
|
function default_1(version) {
|
||||||
Platform[Platform["Windows"] = 0] = "Windows";
|
|
||||||
Platform[Platform["MacOS"] = 1] = "MacOS";
|
|
||||||
Platform[Platform["Linux"] = 2] = "Linux";
|
|
||||||
})(Platform = exports.Platform || (exports.Platform = {}));
|
|
||||||
function getPlatform() {
|
|
||||||
switch (os.platform()) {
|
|
||||||
case 'win32':
|
|
||||||
return Platform.Windows;
|
|
||||||
case 'darwin':
|
|
||||||
return Platform.MacOS;
|
|
||||||
case 'linux':
|
|
||||||
return Platform.Linux;
|
|
||||||
default:
|
|
||||||
throw Error('Platform not recognized');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exports.getPlatform = getPlatform;
|
|
||||||
function default_1(inputs, platform) {
|
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
const installDir = tc.find('Ruby', inputs.version);
|
const installDir = tc.find('Ruby', version);
|
||||||
if (!installDir) {
|
if (!installDir) {
|
||||||
throw new Error(`Version ${inputs.version} not found`);
|
throw new Error(`Version ${version} not found`);
|
||||||
}
|
}
|
||||||
const toolPath = path.join(installDir, 'bin');
|
const toolPath = path.join(installDir, 'bin');
|
||||||
if (platform !== Platform.Windows) {
|
if (!IS_WINDOWS) {
|
||||||
// Ruby / Gem heavily use the '#!/usr/bin/ruby' to find ruby, so this task needs to
|
// Ruby / Gem heavily use the '#!/usr/bin/ruby' to find ruby, so this task needs to
|
||||||
// replace that version of ruby so all the correct version of ruby gets selected
|
// replace that version of ruby so all the correct version of ruby gets selected
|
||||||
// replace the default
|
// replace the default
|
||||||
const dest = '/usr/bin/ruby';
|
const dest = '/usr/bin/ruby';
|
||||||
exec.exec('sudo ln', ['-sf', path.join(toolPath, 'ruby'), dest]); // replace any existing
|
exec.exec('sudo ln', ['-sf', path.join(toolPath, 'ruby'), dest]); // replace any existing
|
||||||
}
|
}
|
||||||
if (inputs.addToPath === 'true') {
|
|
||||||
core.addPath(toolPath);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
exports.default = default_1;
|
exports.default = default_1;
|
||||||
|
|||||||
@@ -14,15 +14,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|||||||
result["default"] = mod;
|
result["default"] = mod;
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||||
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||||
|
};
|
||||||
Object.defineProperty(exports, "__esModule", { value: true });
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
const core = __importStar(require("@actions/core"));
|
const core = __importStar(require("@actions/core"));
|
||||||
const find_ruby_1 = __importStar(require("./find-ruby"));
|
const find_ruby_1 = __importDefault(require("./find-ruby"));
|
||||||
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');
|
const version = core.getInput('version');
|
||||||
const addToPath = core.getInput('add-to-path');
|
yield find_ruby_1.default(version);
|
||||||
yield find_ruby_1.default({ version, addToPath }, find_ruby_1.getPlatform());
|
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
core.setFailed(error.message);
|
core.setFailed(error.message);
|
||||||
|
|||||||
@@ -1,51 +1,23 @@
|
|||||||
import * as core from '@actions/core';
|
|
||||||
import * as exec from '@actions/exec';
|
import * as exec from '@actions/exec';
|
||||||
import * as tc from '@actions/tool-cache';
|
import * as tc from '@actions/tool-cache';
|
||||||
import * as os from 'os';
|
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
|
|
||||||
export enum Platform {
|
const IS_WINDOWS = process.platform === 'win32';
|
||||||
Windows,
|
|
||||||
MacOS,
|
|
||||||
Linux
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getPlatform(): Platform {
|
export default async function(version: string) {
|
||||||
switch (os.platform()) {
|
const installDir: string | null = tc.find('Ruby', version);
|
||||||
case 'win32':
|
|
||||||
return Platform.Windows;
|
|
||||||
case 'darwin':
|
|
||||||
return Platform.MacOS;
|
|
||||||
case 'linux':
|
|
||||||
return Platform.Linux;
|
|
||||||
default:
|
|
||||||
throw Error('Platform not recognized');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ActionInputs {
|
|
||||||
version: string;
|
|
||||||
addToPath: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default async function(inputs: ActionInputs, platform: Platform) {
|
|
||||||
const installDir: string | null = tc.find('Ruby', inputs.version);
|
|
||||||
|
|
||||||
if (!installDir) {
|
if (!installDir) {
|
||||||
throw new Error(`Version ${inputs.version} not found`);
|
throw new Error(`Version ${version} not found`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const toolPath: string = path.join(installDir, 'bin');
|
const toolPath: string = path.join(installDir, 'bin');
|
||||||
|
|
||||||
if (platform !== Platform.Windows) {
|
if (!IS_WINDOWS) {
|
||||||
// Ruby / Gem heavily use the '#!/usr/bin/ruby' to find ruby, so this task needs to
|
// Ruby / Gem heavily use the '#!/usr/bin/ruby' to find ruby, so this task needs to
|
||||||
// replace that version of ruby so all the correct version of ruby gets selected
|
// replace that version of ruby so all the correct version of ruby gets selected
|
||||||
// replace the default
|
// replace the default
|
||||||
const dest: string = '/usr/bin/ruby';
|
const dest: string = '/usr/bin/ruby';
|
||||||
exec.exec('sudo ln', ['-sf', path.join(toolPath, 'ruby'), dest]); // replace any existing
|
exec.exec('sudo ln', ['-sf', path.join(toolPath, 'ruby'), dest]); // replace any existing
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inputs.addToPath === 'true') {
|
|
||||||
core.addPath(toolPath);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
import * as core from '@actions/core';
|
import * as core from '@actions/core';
|
||||||
import findRubyVersion, {getPlatform} from './find-ruby';
|
import findRubyVersion from './find-ruby';
|
||||||
|
|
||||||
async function run() {
|
async function run() {
|
||||||
try {
|
try {
|
||||||
const version = core.getInput('version');
|
const version = core.getInput('version');
|
||||||
const addToPath = core.getInput('add-to-path');
|
await findRubyVersion(version);
|
||||||
await findRubyVersion({version, addToPath}, getPlatform());
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
core.setFailed(error.message);
|
core.setFailed(error.message);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user