mirror of
https://github.com/actions/setup-node.git
synced 2025-07-04 00:24:58 +00:00
fixed merge conflicts
This commit is contained in:
commit
25794099fc
8 changed files with 85 additions and 96 deletions
|
@ -6,10 +6,7 @@ import cp from 'child_process';
|
|||
import osm = require('os');
|
||||
import path from 'path';
|
||||
import * as main from '../src/main';
|
||||
import * as nv from '../src/node-version';
|
||||
import * as nvf from '../src/node-version-file';
|
||||
import * as auth from '../src/authutil';
|
||||
|
||||
let nodeTestManifest = require('./data/versions-manifest.json');
|
||||
let nodeTestDist = require('./data/node-dist-index.json');
|
||||
|
||||
|
@ -597,9 +594,7 @@ describe('setup-node', () => {
|
|||
expect(parseNodeVersionSpy).toHaveBeenCalledWith(versionSpec);
|
||||
expect(logSpy).toHaveBeenCalledWith(
|
||||
`Resolved ${versionFile} as ${expectedVersionSpec}`);
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
describe('LTS version', () => {
|
||||
beforeEach(() => {
|
||||
os.platform = 'linux';
|
||||
|
@ -819,3 +814,4 @@ describe('setup-node', () => {
|
|||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue