Improve support for phive

This commit is contained in:
Shivam Mathur 2020-12-14 14:37:12 +05:30
parent d6f700217a
commit ea8be20255
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
3 changed files with 42 additions and 6 deletions

View File

@ -167,14 +167,22 @@ describe('Tools tests', () => {
}); });
it('checking addPhive', async () => { it('checking addPhive', async () => {
let script: string = await tools.addPhive('1.2.3', 'linux'); let script: string = await tools.addPhive('1.2.3', '7.4', 'linux');
expect(script).toContain( expect(script).toContain(
'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive' 'add_tool https://github.com/phar-io/phive/releases/download/1.2.3/phive-1.2.3.phar phive'
); );
script = await tools.addPhive('latest', 'win32'); script = await tools.addPhive('latest', '5.5', 'win32');
expect(script).toContain('Phive is not supported on PHP 5.5');
script = await tools.addPhive('latest', '5.6', 'win32');
expect(script).toContain( expect(script).toContain(
'Add-Tool https://phar.io/releases/phive.phar phive' 'Add-Tool https://github.com/phar-io/phive/releases/download/0.12.1/phive-0.12.1.phar phive'
);
script = await tools.addPhive('latest', '7.1', 'win32');
expect(script).toContain(
'Add-Tool https://github.com/phar-io/phive/releases/download/0.13.5/phive-0.13.5.phar phive'
); );
}); });

15
dist/index.js vendored
View File

@ -1908,9 +1908,20 @@ exports.getCodeceptionUri = getCodeceptionUri;
* Helper function to get script to setup phive * Helper function to get script to setup phive
* *
* @param version * @param version
* @param php_version
* @param os_version * @param os_version
*/ */
async function addPhive(version, os_version) { async function addPhive(version, php_version, os_version) {
switch (true) {
case /5\.[3-5]/.test(php_version):
return await utils.addLog('$cross', 'phive', 'Phive is not supported on PHP ' + php_version, os_version);
case /5\.6|7\.0/.test(php_version):
version = version.replace('latest', '0.12.1');
break;
case /7\.1/.test(php_version):
version = version.replace('latest', '0.13.5');
break;
}
switch (version) { switch (version) {
case 'latest': case 'latest':
return ((await utils.getCommand(os_version, 'tool')) + return ((await utils.getCommand(os_version, 'tool')) +
@ -2208,7 +2219,7 @@ async function addTools(tools_csv, php_version, os_version) {
script += await addPackage(tool, release, 'robmorgan/', os_version); script += await addPackage(tool, release, 'robmorgan/', os_version);
break; break;
case 'phive': case 'phive':
script += await addPhive(version, os_version); script += await addPhive(version, php_version, os_version);
break; break;
case 'php-config': case 'php-config':
case 'phpize': case 'phpize':

View File

@ -157,12 +157,29 @@ export async function getCodeceptionUri(
* Helper function to get script to setup phive * Helper function to get script to setup phive
* *
* @param version * @param version
* @param php_version
* @param os_version * @param os_version
*/ */
export async function addPhive( export async function addPhive(
version: string, version: string,
php_version: string,
os_version: string os_version: string
): Promise<string> { ): Promise<string> {
switch (true) {
case /5\.[3-5]/.test(php_version):
return await utils.addLog(
'$cross',
'phive',
'Phive is not supported on PHP ' + php_version,
os_version
);
case /5\.6|7\.0/.test(php_version):
version = version.replace('latest', '0.12.1');
break;
case /7\.1/.test(php_version):
version = version.replace('latest', '0.13.5');
break;
}
switch (version) { switch (version) {
case 'latest': case 'latest':
return ( return (
@ -539,7 +556,7 @@ export async function addTools(
script += await addPackage(tool, release, 'robmorgan/', os_version); script += await addPackage(tool, release, 'robmorgan/', os_version);
break; break;
case 'phive': case 'phive':
script += await addPhive(version, os_version); script += await addPhive(version, php_version, os_version);
break; break;
case 'php-config': case 'php-config':
case 'phpize': case 'phpize':