actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2024-11-22 20:01:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use ppa:ondrej/php for phalcon except for PHP7.4

Browse Source
This commit is contained in:
Shivam Mathur 2020-01-20 21:07:51 +05:30
parent 8489dbf4de
commit b44e5e009f
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
__tests__/extensions.test.ts
View File

@ -41,22 +41,10 @@ describe('Extension tests', () => {
linux = await extensions.addExtension('gearman', '7.1', 'linux'); linux = await extensions.addExtension('gearman', '7.1', 'linux');
expect(linux).toContain('gearman.sh 7.1'); expect(linux).toContain('gearman.sh 7.1');
linux = await extensions.addExtension( linux = await extensions.addExtension('gearman', '7.2', 'linux');
'phalcon3, phalcon4, gearman',
'7.2',
'linux'
);
expect(linux).toContain('phalcon.sh phalcon3 7.2');
expect(linux).toContain('phalcon.sh phalcon4 7.2');
expect(linux).toContain('gearman.sh 7.2'); expect(linux).toContain('gearman.sh 7.2');
linux = await extensions.addExtension( linux = await extensions.addExtension('gearman', '7.3', 'linux');
'phalcon3, phalcon4, gearman',
'7.3',
'linux'
);
expect(linux).toContain('phalcon.sh phalcon3 7.3');
expect(linux).toContain('phalcon.sh phalcon4 7.3');
expect(linux).toContain('gearman.sh 7.3'); expect(linux).toContain('gearman.sh 7.3');
linux = await extensions.addExtension('phalcon4, gearman', '7.4', 'linux'); linux = await extensions.addExtension('phalcon4, gearman', '7.4', 'linux');

4
dist/index.js vendored
View File

@ -2676,8 +2676,8 @@ function addExtensionLinux(extension_csv, version, pipe) {
'\n' + '\n' +
(yield utils.addLog('$tick', 'xdebug', 'Enabled', 'linux')); (yield utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
return; return;
// match 7.0phalcon3..7.3phalcon3 and 7.2phalcon4...7.4phalcon4 // match 7.4phalcon4
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension): case /^7.4phalcon4$/.test(version_extension):
script += script +=
'\nsh ' + '\nsh ' +
path.join(__dirname, '../src/scripts/ext/phalcon.sh') + path.join(__dirname, '../src/scripts/ext/phalcon.sh') +

4
src/extensions.ts
View File

@ -129,8 +129,8 @@ export async function addExtensionLinux(
'\n' + '\n' +
(await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux')); (await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
return; return;
// match 7.0phalcon3..7.3phalcon3 and 7.2phalcon4...7.4phalcon4 // match 7.4phalcon4
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension): case /^7.4phalcon4$/.test(version_extension):
script += script +=
'\nsh ' + '\nsh ' +
path.join(__dirname, '../src/scripts/ext/phalcon.sh') + path.join(__dirname, '../src/scripts/ext/phalcon.sh') +