mirror of
https://github.com/shivammathur/setup-php.git
synced 2024-11-23 04:11:06 +07:00
Use ppa:ondrej/php for phalcon4 on PHP7.4
This commit is contained in:
parent
e9c783eef0
commit
e58c704985
@ -47,8 +47,7 @@ describe('Extension tests', () => {
|
|||||||
linux = await extensions.addExtension('gearman', '7.3', 'linux');
|
linux = await extensions.addExtension('gearman', '7.3', 'linux');
|
||||||
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('gearman', '7.4', 'linux');
|
||||||
expect(linux).toContain('phalcon.sh phalcon4 7.4');
|
|
||||||
expect(linux).toContain('gearman.sh 7.4');
|
expect(linux).toContain('gearman.sh 7.4');
|
||||||
|
|
||||||
linux = await extensions.addExtension('xdebug', '7.2', 'fedora');
|
linux = await extensions.addExtension('xdebug', '7.2', 'fedora');
|
||||||
|
13
dist/index.js
vendored
13
dist/index.js
vendored
@ -2676,19 +2676,6 @@ 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.4phalcon4
|
|
||||||
case /^7.4phalcon4$/.test(version_extension):
|
|
||||||
script +=
|
|
||||||
'\nsh ' +
|
|
||||||
path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
|
|
||||||
' ' +
|
|
||||||
extension +
|
|
||||||
' ' +
|
|
||||||
version +
|
|
||||||
pipe +
|
|
||||||
'\n' +
|
|
||||||
(yield utils.addLog('$tick', extension, 'Installed and enabled', 'linux'));
|
|
||||||
return;
|
|
||||||
default:
|
default:
|
||||||
install_command =
|
install_command =
|
||||||
'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
|
'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
|
||||||
|
@ -129,24 +129,6 @@ export async function addExtensionLinux(
|
|||||||
'\n' +
|
'\n' +
|
||||||
(await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
|
(await utils.addLog('$tick', 'xdebug', 'Enabled', 'linux'));
|
||||||
return;
|
return;
|
||||||
// match 7.4phalcon4
|
|
||||||
case /^7.4phalcon4$/.test(version_extension):
|
|
||||||
script +=
|
|
||||||
'\nsh ' +
|
|
||||||
path.join(__dirname, '../src/scripts/ext/phalcon.sh') +
|
|
||||||
' ' +
|
|
||||||
extension +
|
|
||||||
' ' +
|
|
||||||
version +
|
|
||||||
pipe +
|
|
||||||
'\n' +
|
|
||||||
(await utils.addLog(
|
|
||||||
'$tick',
|
|
||||||
extension,
|
|
||||||
'Installed and enabled',
|
|
||||||
'linux'
|
|
||||||
));
|
|
||||||
return;
|
|
||||||
default:
|
default:
|
||||||
install_command =
|
install_command =
|
||||||
'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
|
'sudo DEBIAN_FRONTEND=noninteractive apt-get install -y php' +
|
||||||
|
Loading…
Reference in New Issue
Block a user