actions/setup-node
1
0
Fork 0
mirror of https://github.com/actions/setup-node.git synced 2025-07-26 08:28:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fixed merge conflicts

Browse source
This commit is contained in:
La'Kaleigh Harris 2021-10-04 15:14:32 +00:00 • committed by GitHub
commit 25794099fc
8 changed files with 85 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.ts
View file

@ -5,7 +5,6 @@ import fs = require('fs');
import * as path from 'path';
import {restoreCache} from './cache-restore';
import {URL} from 'url';
import {parseNodeVersionFile} from './node-version-file';
import os = require('os');
export async function run() {
@ -24,7 +23,7 @@ export async function run() {
if (!!versionFile) {
const versionFilePath = path.join(__dirname, '..', versionFile);
version = await parseNodeVersionFile(
version = await installer.parseNodeVersionFile(
fs.readFileSync(versionFilePath, 'utf8')
);
core.info(`Resolved ${versionFile} as ${version}`);
@ -88,3 +87,4 @@ function isGhes(): boolean {
);
return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
}