mirror of
https://github.com/shivammathur/setup-php.git
synced 2024-11-23 04:11:06 +07:00
Fix extension_version on windows
This commit is contained in:
parent
2c559eae3d
commit
d99c8732ba
8
dist/index.js
vendored
8
dist/index.js
vendored
@ -2765,13 +2765,7 @@ function addExtensionWindows(extension_csv, version, pipe) {
|
|||||||
break;
|
break;
|
||||||
// match exact versions
|
// match exact versions
|
||||||
case /.*-\d+\.\d+\.\d+/.test(version_extension):
|
case /.*-\d+\.\d+\.\d+/.test(version_extension):
|
||||||
script +=
|
script += '\nAdd-Extension ' + extension_name + ' stable ' + stability;
|
||||||
'\nAdd-Extension ' +
|
|
||||||
extension_name +
|
|
||||||
' ' +
|
|
||||||
'stable' +
|
|
||||||
' ' +
|
|
||||||
stability;
|
|
||||||
return;
|
return;
|
||||||
// match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
|
// match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
|
||||||
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
|
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
|
||||||
|
@ -104,13 +104,7 @@ export async function addExtensionWindows(
|
|||||||
break;
|
break;
|
||||||
// match exact versions
|
// match exact versions
|
||||||
case /.*-\d+\.\d+\.\d+/.test(version_extension):
|
case /.*-\d+\.\d+\.\d+/.test(version_extension):
|
||||||
script +=
|
script += '\nAdd-Extension ' + extension_name + ' stable ' + stability;
|
||||||
'\nAdd-Extension ' +
|
|
||||||
extension_name +
|
|
||||||
' ' +
|
|
||||||
'stable' +
|
|
||||||
' ' +
|
|
||||||
stability;
|
|
||||||
return;
|
return;
|
||||||
// match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
|
// match 7.0phalcon3...7.3phalcon3 and 7.2phalcon4...7.4phalcon4
|
||||||
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
|
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
|
||||||
|
@ -55,7 +55,10 @@ Function Add-Extension {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Version $extension_version -Path $php_dir
|
if($extension_version -ne '') {
|
||||||
|
$extension = "$extension -Version $extension_version"
|
||||||
|
}
|
||||||
|
Install-PhpExtension -Extension $extension -MinimumStability $mininum_stability -Path $php_dir
|
||||||
Add-Log $tick $extension "Installed and enabled"
|
Add-Log $tick $extension "Installed and enabled"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user