Skip to content

Commit

Permalink
Merge pull request #310 from actions/revert-308-v-alsvir/disable-cach…
Browse files Browse the repository at this point in the history
…e-usage-temp-v2

Revert "Temporarily disabled cache usage for v2"
  • Loading branch information
AlenaSviridenko authored Aug 4, 2021
2 parents d6e3b55 + 896ee80 commit 4d0182a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 18 deletions.
21 changes: 7 additions & 14 deletions __tests__/installer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ describe('setup-node', () => {
// Found in cache tests
//--------------------------------------------------

// Usage of pre-cached Node.js versions is temporarily disabled.
xit('finds version in cache with stable true', async () => {
it('finds version in cache with stable true', async () => {
inputs['node-version'] = '12';
inputs.stable = 'true';

Expand All @@ -183,8 +182,7 @@ describe('setup-node', () => {
expect(logSpy).toHaveBeenCalledWith(`Found in cache @ ${toolPath}`);
});

// Usage of pre-cached Node.js versions is temporarily disabled.
xit('finds version in cache with stable not supplied', async () => {
it('finds version in cache with stable not supplied', async () => {
inputs['node-version'] = '12';

inSpy.mockImplementation(name => inputs[name]);
Expand All @@ -196,8 +194,7 @@ describe('setup-node', () => {
expect(logSpy).toHaveBeenCalledWith(`Found in cache @ ${toolPath}`);
});

// Usage of pre-cached Node.js versions is temporarily disabled.
xit('finds version in cache and adds it to the path', async () => {
it('finds version in cache and adds it to the path', async () => {
inputs['node-version'] = '12';

inSpy.mockImplementation(name => inputs[name]);
Expand Down Expand Up @@ -387,8 +384,7 @@ describe('setup-node', () => {
}, 100000);

describe('check-latest flag', () => {
// Usage of pre-cached Node.js versions is temporarily disabled.
xit('use local version and dont check manifest if check-latest is not specified', async () => {
it('use local version and dont check manifest if check-latest is not specified', async () => {
os.platform = 'linux';
os.arch = 'x64';

Expand All @@ -409,8 +405,7 @@ describe('setup-node', () => {
);
});

// Usage of pre-cached Node.js versions is temporarily disabled.
xit('check latest version and resolve it from local cache', async () => {
it('check latest version and resolve it from local cache', async () => {
os.platform = 'linux';
os.arch = 'x64';

Expand Down Expand Up @@ -561,8 +556,7 @@ describe('setup-node', () => {
inputs.stable = 'true';
});

// Usage of pre-cached Node.js versions is temporarily disabled.
xit('find latest LTS version and resolve it from local cache (lts/erbium)', async () => {
it('find latest LTS version and resolve it from local cache (lts/erbium)', async () => {
// arrange
inputs['node-version'] = 'lts/erbium';

Expand Down Expand Up @@ -632,8 +626,7 @@ describe('setup-node', () => {
);
});

// Usage of pre-cached Node.js versions is temporarily disabled.
xit('find latest LTS version and resolve it from local cache (lts/*)', async () => {
it('find latest LTS version and resolve it from local cache (lts/*)', async () => {
// arrange
inputs['node-version'] = 'lts/*';

Expand Down
5 changes: 3 additions & 2 deletions dist/setup/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -65086,8 +65086,9 @@ function getNode(versionSpec, stable, checkLatest, auth, arch = os.arch()) {
let toolPath;
toolPath = tc.find('node', versionSpec, osArch);
// If not found in cache, download
// Usage of pre-cached Node.js versions is temporarily disabled.
if (false) {}
if (toolPath) {
core.info(`Found in cache @ ${toolPath}`);
}
else {
core.info(`Attempting to download ${versionSpec}...`);
let downloadPath = '';
Expand Down
3 changes: 1 addition & 2 deletions src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ export async function getNode(
toolPath = tc.find('node', versionSpec, osArch);

// If not found in cache, download
// Usage of pre-cached Node.js versions is temporarily disabled.
if (false) {
if (toolPath) {
core.info(`Found in cache @ ${toolPath}`);
} else {
core.info(`Attempting to download ${versionSpec}...`);
Expand Down

0 comments on commit 4d0182a

Please sign in to comment.