Skip to content

Commit

Permalink
Merge pull request #103 from shivammathur/develop
Browse files Browse the repository at this point in the history
1.5.8
  • Loading branch information
shivammathur authored Dec 6, 2019
2 parents 6d82503 + 3ff7f9c commit 14acb26
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Setup PHP with required extensions, php.ini configuration and composer in [GitHu
|5.6|`Stable`|`End of life`|
|7.0|`Stable`|`End of life`|
|7.1|`Stable`|`End of life`|
|7.2|`Stable`|`Security fixes only `|
|7.2|`Stable`|`Security fixes only`|
|7.3|`Stable`|`Active`|
|7.4|`Stable`|`Active`|

Expand Down
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "setup-php",
"version": "1.5.7",
"version": "1.5.8",
"private": false,
"description": "Setup PHP for use with GitHub Actions",
"main": "dist/index.js",
Expand Down Expand Up @@ -44,7 +44,7 @@
"jest-circus": "^24.9.0",
"prettier": "^1.17.1",
"ts-jest": "^24.1.0",
"typescript": "^3.6.4"
"typescript": "^3.7.3"
},
"husky": {
"skipCI": true,
Expand Down
3 changes: 0 additions & 3 deletions src/scripts/win32.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ else {
Set-PhpIniKey -Key 'date.timezone' -Value 'UTC' -Path $php_dir
Enable-PhpExtension -Extension openssl, curl -Path $php_dir
Update-PhpCAInfo -Path $php_dir -Source CurrentUser
if ([Version]$installed.Version -ge '7.4') {
Copy-Item "$dir\..\src\ext\php_pcov.dll" -Destination "$($installed.ExtensionsPath)\php_pcov.dll"
}
Add-Log $tick "PHP" $status

Install-Composer -Scope System -Path $php_dir -PhpPath $php_dir
Expand Down

0 comments on commit 14acb26

Please sign in to comment.