From 7bd9f10bef45e4a79bfdd985a904526a0be83edf Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Fri, 23 Jul 2021 13:59:16 +0530 Subject: [PATCH] Add no_tools_cache flag --- __tests__/tools.test.ts | 32 +++++++++++++++++++------------- dist/index.js | 3 ++- src/tools.ts | 3 ++- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/__tests__/tools.test.ts b/__tests__/tools.test.ts index 388ce164..ba2e707f 100644 --- a/__tests__/tools.test.ts +++ b/__tests__/tools.test.ts @@ -256,26 +256,32 @@ describe('Tools tests', () => { }); it.each` - version | cache_url | source_url - ${'latest'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar'} | ${'https://getcomposer.org/composer-stable.phar'} - ${'stable'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar'} | ${'https://getcomposer.org/composer-stable.phar'} - ${'snapshot'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar'} | ${'https://getcomposer.org/composer.phar'} - ${'preview'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-preview.phar'} | ${'https://getcomposer.org/composer-preview.phar'} - ${'1'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-1.phar'} | ${'https://getcomposer.org/composer-1.phar'} - ${'2'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-2.phar'} | ${'https://getcomposer.org/composer-2.phar'} - ${'1.2.3'} | ${'https://github.com/composer/composer/releases/download/1.2.3/composer.phar'} | ${'https://getcomposer.org/composer-1.2.3.phar'} - ${'1.2.3-RC1'} | ${'https://github.com/composer/composer/releases/download/1.2.3-RC1/composer.phar'} | ${'https://getcomposer.org/composer-1.2.3-RC1.phar'} + version | no_tool_cache | cache_url | source_url + ${'latest'} | ${'true'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar'} | ${'https://getcomposer.org/composer-stable.phar'} + ${'stable'} | ${'true'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-stable.phar'} | ${'https://getcomposer.org/composer-stable.phar'} + ${'snapshot'} | ${'true'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-snapshot.phar'} | ${'https://getcomposer.org/composer.phar'} + ${'preview'} | ${'true'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-preview.phar'} | ${'https://getcomposer.org/composer-preview.phar'} + ${'1'} | ${'false'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-1.phar'} | ${'https://getcomposer.org/composer-1.phar'} + ${'2'} | ${'false'} | ${'https://github.com/shivammathur/composer-cache/releases/latest/download/composer-2.phar'} | ${'https://getcomposer.org/composer-2.phar'} + ${'1.2.3'} | ${'false'} | ${'https://github.com/composer/composer/releases/download/1.2.3/composer.phar'} | ${'https://getcomposer.org/composer-1.2.3.phar'} + ${'1.2.3-RC1'} | ${'false'} | ${'https://github.com/composer/composer/releases/download/1.2.3-RC1/composer.phar'} | ${'https://getcomposer.org/composer-1.2.3-RC1.phar'} `( - 'checking addComposer: $version', - async ({version, cache_url, source_url}) => { + 'checking addComposer: $version, $no_tool_cache', + async ({version, no_tool_cache, cache_url, source_url}) => { const data = getData({ tool: 'composer', domain: 'https://getcomposer.org', repository: 'composer/composer', version: version }); - expect(await tools.addComposer(data)).toContain(cache_url); - expect(await tools.addComposer(data)).toContain(source_url); + process.env['no_tools_cache'] = no_tool_cache; + if (no_tool_cache !== 'true') { + expect(await tools.addComposer(data)).toContain( + `${cache_url},${source_url}` + ); + } else { + expect(await tools.addComposer(data)).toContain(source_url); + } } ); diff --git a/dist/index.js b/dist/index.js index 47512b0b..848ba92c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -638,7 +638,8 @@ async function addComposer(data) { default: source_url = `${getcomposer}/composer-stable.phar`; } - data['url'] = `${cache_url},${source_url}`; + const use_cache = (await utils.readEnv('NO_TOOLS_CACHE')) !== 'true'; + data['url'] = use_cache ? `${cache_url},${source_url}` : source_url; data['version_parameter'] = data['version']; return await addArchive(data); } diff --git a/src/tools.ts b/src/tools.ts index 94b1c1b9..03acb232 100644 --- a/src/tools.ts +++ b/src/tools.ts @@ -212,7 +212,8 @@ export async function addComposer(data: RS): Promise { default: source_url = `${getcomposer}/composer-stable.phar`; } - data['url'] = `${cache_url},${source_url}`; + const use_cache: boolean = (await utils.readEnv('NO_TOOLS_CACHE')) !== 'true'; + data['url'] = use_cache ? `${cache_url},${source_url}` : source_url; data['version_parameter'] = data['version']; return await addArchive(data); }