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

Merge pull request #90 from shivammathur/develop

Browse Source 
Fix PHP-FPM in PHP and add a flag to skip checksum check if it fails
This commit is contained in:
Shivam Mathur 2019-11-27 23:56:05 +05:30 committed by GitHub
commit 99e2d8d309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/scripts/linux.sh
View File

@ -20,6 +20,8 @@ existing_version=$(php-config --version | cut -c 1-3)
version=$1 version=$1
status="Switched to PHP$version" status="Switched to PHP$version"
step_log "Setup PHP and Composer" step_log "Setup PHP and Composer"
sudo mkdir -p /var/run
sudo mkdir -p /run/php
find /etc/apt/sources.list.d -type f -name 'ondrej-ubuntu-php*.list' -exec sudo DEBIAN_FRONTEND=noninteractive apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1 find /etc/apt/sources.list.d -type f -name 'ondrej-ubuntu-php*.list' -exec sudo DEBIAN_FRONTEND=noninteractive apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1
if [ "$existing_version" != "$1" ]; then if [ "$existing_version" != "$1" ]; then
if [ ! -e "/usr/bin/php$1" ]; then if [ ! -e "/usr/bin/php$1" ]; then
@ -41,7 +43,6 @@ fi
ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||") ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
sudo chmod 777 "$ini_file" sudo chmod 777 "$ini_file"
sudo mkdir -p /run/php
add_log "$tick" "PHP" "$status" add_log "$tick" "PHP" "$status"
if [ "$2" = "true" ]; then if [ "$2" = "true" ]; then
if [ "$1" != "7.4" ]; then if [ "$1" != "7.4" ]; then

1
src/scripts/win32.ps1
View File

@ -53,6 +53,7 @@ catch {
try { try {
Update-PhpCAInfo -Path $php_dir -Source Curl Update-PhpCAInfo -Path $php_dir -Source Curl
} catch { } catch {
Update-PhpCAInfo -Path $php_dir -Source Curl -SkipChecksumCheck
} }
} }
if ([Version]$installed.Version -ge '7.4') { if ([Version]$installed.Version -ge '7.4') {