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

Accept PECL default parameters

Browse Source
This commit is contained in:
Shivam Mathur 2020-07-25 12:27:51 +05:30
parent 83bdf158fa
commit 67152eb712
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
__tests__/extensions.test.ts
View File

@ -136,7 +136,7 @@ describe('Extension tests', () => {
expect(darwin).toContain('add_brew_extension grpc'); expect(darwin).toContain('add_brew_extension grpc');
expect(darwin).toContain('add_brew_extension protobuf'); expect(darwin).toContain('add_brew_extension protobuf');
expect(darwin).toContain('add_brew_extension swoole'); expect(darwin).toContain('add_brew_extension swoole');
expect(darwin).toContain('sudo pecl install -f sqlite3'); expect(darwin).toContain('pecl_install sqlite3');
expect(darwin).toContain('remove_extension intl'); expect(darwin).toContain('remove_extension intl');
expect(darwin).toContain('add_unstable_extension ast beta extension'); expect(darwin).toContain('add_unstable_extension ast beta extension');
expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension'); expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension');
@ -163,13 +163,13 @@ describe('Extension tests', () => {
expect(darwin).toContain('add_brew_extension pcov'); expect(darwin).toContain('add_brew_extension pcov');
darwin = await extensions.addExtension('xdebug', '5.3', 'darwin'); darwin = await extensions.addExtension('xdebug', '5.3', 'darwin');
expect(darwin).toContain('sudo pecl install -f xdebug-2.2.7'); expect(darwin).toContain('pecl_install xdebug-2.2.7');
darwin = await extensions.addExtension('xdebug', '5.4', 'darwin'); darwin = await extensions.addExtension('xdebug', '5.4', 'darwin');
expect(darwin).toContain('sudo pecl install -f xdebug-2.4.1'); expect(darwin).toContain('pecl_install xdebug-2.4.1');
darwin = await extensions.addExtension('xdebug', '5.5', 'darwin'); darwin = await extensions.addExtension('xdebug', '5.5', 'darwin');
expect(darwin).toContain('sudo pecl install -f xdebug-2.5.5'); expect(darwin).toContain('pecl_install xdebug-2.5.5');
darwin = await extensions.addExtension('xdebug', '5.6', 'darwin'); darwin = await extensions.addExtension('xdebug', '5.6', 'darwin');
expect(darwin).toContain('add_brew_extension xdebug'); expect(darwin).toContain('add_brew_extension xdebug');
@ -181,18 +181,18 @@ describe('Extension tests', () => {
expect(darwin).toContain('add_brew_extension xdebug'); expect(darwin).toContain('add_brew_extension xdebug');
darwin = await extensions.addExtension('redis', '5.6', 'darwin'); darwin = await extensions.addExtension('redis', '5.6', 'darwin');
expect(darwin).toContain('sudo pecl install -f redis-2.2.8'); expect(darwin).toContain('pecl_install redis-2.2.8');
darwin = await extensions.addExtension('redis', '7.2', 'darwin'); darwin = await extensions.addExtension('redis', '7.2', 'darwin');
expect(darwin).toContain('sudo pecl install -f redis'); expect(darwin).toContain('pecl_install redis');
darwin = await extensions.addExtension('imagick', '5.6', 'darwin'); darwin = await extensions.addExtension('imagick', '5.6', 'darwin');
expect(darwin).toContain('brew install pkg-config imagemagick'); expect(darwin).toContain('brew install pkg-config imagemagick');
expect(darwin).toContain('sudo pecl install -f imagick'); expect(darwin).toContain('pecl_install imagick');
darwin = await extensions.addExtension('imagick', '7.4', 'darwin'); darwin = await extensions.addExtension('imagick', '7.4', 'darwin');
expect(darwin).toContain('brew install pkg-config imagemagick'); expect(darwin).toContain('brew install pkg-config imagemagick');
expect(darwin).toContain('sudo pecl install -f imagick'); expect(darwin).toContain('pecl_install imagick');
darwin = await extensions.addExtension('blackfire', '7.3', 'darwin'); darwin = await extensions.addExtension('blackfire', '7.3', 'darwin');
expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire'); expect(darwin).toContain('blackfire_darwin.sh 7.3 blackfire');

2
dist/index.js vendored
View File

@ -3629,7 +3629,7 @@ async function addExtensionDarwin(extension_csv, version, pipe) {
const version_extension = version + extension; const version_extension = version + extension;
const [ext_name, ext_version] = extension.split('-'); const [ext_name, ext_version] = extension.split('-');
const ext_prefix = await utils.getExtensionPrefix(ext_name); const ext_prefix = await utils.getExtensionPrefix(ext_name);
const command_prefix = 'sudo pecl install -f '; const command_prefix = 'pecl_install ';
let command = ''; let command = '';
switch (true) { switch (true) {
// match :extension // match :extension

2
src/extensions.ts
View File

@ -20,7 +20,7 @@ export async function addExtensionDarwin(
const version_extension: string = version + extension; const version_extension: string = version + extension;
const [ext_name, ext_version]: string[] = extension.split('-'); const [ext_name, ext_version]: string[] = extension.split('-');
const ext_prefix = await utils.getExtensionPrefix(ext_name); const ext_prefix = await utils.getExtensionPrefix(ext_name);
const command_prefix = 'sudo pecl install -f '; const command_prefix = 'pecl_install ';
let command = ''; let command = '';
switch (true) { switch (true) {
// match :extension // match :extension

18
src/scripts/darwin.sh
View File

@ -70,6 +70,12 @@ get_pecl_version() {
echo "$pecl_version" echo "$pecl_version"
} }
# Function to install PECL extensions and accept default options
pecl_install() {
local extension=$1
yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
}
# Function to install a specific version of PECL extension. # Function to install a specific version of PECL extension.
add_pecl_extension() { add_pecl_extension() {
extension=$1 extension=$1
@ -87,7 +93,7 @@ add_pecl_extension() {
else else
remove_extension "$extension" >/dev/null 2>&1 remove_extension "$extension" >/dev/null 2>&1
( (
sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 && pecl_install "$extension-$pecl_version" &&
check_extension "$extension" && check_extension "$extension" &&
add_log "$tick" "$extension" "Installed and enabled" add_log "$tick" "$extension" "Installed and enabled"
) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver" ) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"
@ -161,12 +167,12 @@ add_tool() {
if [ "$tool" = "composer" ]; then if [ "$tool" = "composer" ]; then
configure_composer "$tool_path" configure_composer "$tool_path"
elif [ "$tool" = "phan" ]; then elif [ "$tool" = "phan" ]; then
add_extension fileinfo "sudo pecl install -f fileinfo" extension >/dev/null 2>&1 add_extension fileinfo "pecl_install fileinfo" extension >/dev/null 2>&1
add_extension ast "sudo pecl install -f ast" extension >/dev/null 2>&1 add_extension ast "pecl_install ast" extension >/dev/null 2>&1
elif [ "$tool" = "phive" ]; then elif [ "$tool" = "phive" ]; then
add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1 add_extension curl "pecl_install curl" extension >/dev/null 2>&1
add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1 add_extension mbstring "pecl_install mbstring" extension >/dev/null 2>&1
add_extension xml "sudo pecl install -f xml" extension >/dev/null 2>&1 add_extension xml "pecl_install xml" extension >/dev/null 2>&1
elif [ "$tool" = "cs2pr" ]; then elif [ "$tool" = "cs2pr" ]; then
sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path" sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path"
tr -d '\r' <"$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path" tr -d '\r' <"$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path"

11
src/scripts/linux.sh
View File

@ -91,6 +91,12 @@ get_pecl_version() {
echo "$pecl_version" echo "$pecl_version"
} }
# Function to install PECL extensions and accept default options
pecl_install() {
local extension=$1
yes '' | sudo pecl install -f "$extension" >/dev/null 2>&1
}
# Function to check if an extension is loaded. # Function to check if an extension is loaded.
check_extension() { check_extension() {
extension=$1 extension=$1
@ -167,8 +173,7 @@ add_extension() {
install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}" install_command="update_lists && ${install_command/5\.[4-5]-$extension/5-$extension=$release_version}"
fi fi
eval "$install_command" >/dev/null 2>&1 || eval "$install_command" >/dev/null 2>&1 ||
(update_lists && eval "$install_command" >/dev/null 2>&1) || (update_lists && eval "$install_command" >/dev/null 2>&1) || pecl_install "$extension"
sudo pecl install -f "$extension" >/dev/null 2>&1
(check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") || (check_extension "$extension" && add_log "$tick" "$extension" "Installed and enabled") ||
add_log "$cross" "$extension" "Could not install $extension on PHP $semver" add_log "$cross" "$extension" "Could not install $extension on PHP $semver"
fi fi
@ -192,7 +197,7 @@ add_pecl_extension() {
else else
delete_extension "$extension" delete_extension "$extension"
( (
sudo pecl install -f "$extension-$pecl_version" >/dev/null 2>&1 && pecl_install "$extension-$pecl_version" &&
check_extension "$extension" && check_extension "$extension" &&
add_log "$tick" "$extension" "Installed and enabled" add_log "$tick" "$extension" "Installed and enabled"
) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver" ) || add_log "$cross" "$extension" "Could not install $extension-$pecl_version on PHP $semver"