mirror of
https://github.com/shivammathur/setup-php.git
synced 2024-11-23 04:11:06 +07:00
Improve support for phive
This commit is contained in:
parent
d6f700217a
commit
ea8be20255
@ -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
15
dist/index.js
vendored
@ -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':
|
||||||
|
19
src/tools.ts
19
src/tools.ts
@ -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':
|
||||||
|
Loading…
Reference in New Issue
Block a user