Skip to content

Commit 2b938d9

Browse files
authored
Merge pull request #82 from shivammathur/develop
Improve workflows and documentation
2 parents b9db11a + 71bd88f commit 2b938d9

File tree

6 files changed

+43
-163
lines changed

6 files changed

+43
-163
lines changed

.github/workflows/darwin.yml

-62
This file was deleted.

.github/workflows/windows.yml

-62
This file was deleted.

.github/workflows/ubuntu.yml .github/workflows/workflow.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
name: Ubuntu workflow
1+
name: Main workflow
22
on: [push, pull_request]
33
jobs:
44
run:
55
name: Run
66
runs-on: ${{ matrix.operating-system }}
77
strategy:
88
fail-fast: false
9-
max-parallel: 15
109
matrix:
11-
operating-system: [ubuntu-latest]
10+
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
1211
php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3']
1312
steps:
1413
- name: Checkout

README.md

+17-12
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ Setup PHP with required extensions, php.ini configuration and composer in [GitHu
4646
|7.1|`Stable`|`Security fixes only`|
4747
|7.2|`Stable`|`Active`|
4848
|7.3|`Stable`|`Active`|
49-
|7.4|`RC4`/`RC6`|`Active`|
50-
51-
**Note:** PHP 7.4 is currently in development, do not use in production/release branches.
49+
|7.4|`RC6`|`Active`|
5250

5351
## :cloud: OS/Platform Support
5452

@@ -60,7 +58,7 @@ Setup PHP with required extensions, php.ini configuration and composer in [GitHu
6058
|macOS X Catalina 10.15|`macOS-latest` or `macOS-10.15`|
6159

6260
## :wrench: PHP Extension Support
63-
- On `ubuntu` extensions which have the package in `APT` are installed. If extension is not in `APT`, you can use `PECL` to install the extension as fallback by specifying `pecl: true`.
61+
- On `ubuntu` by default extensions which are available as a package can be installed. If the extension is not available as a package but it is on `PECL`, it can be installed by specifying `pecl: true`.
6462
- On `windows` extensions which have `windows` binary on `PECL` can be installed.
6563
- On `macOS` extensions which are on `PECL` can be installed.
6664
- Extensions which are installed along with PHP if specified are enabled.
@@ -130,18 +128,22 @@ See [action.yml](action.yml "Metadata for this GitHub Action") and usage below f
130128
steps:
131129
- name: Checkout
132130
uses: actions/checkout@master
131+
133132
- name: Setup PHP
134133
uses: shivammathur/setup-php@master
135134
with:
136135
php-version: '7.3'
137-
extension-csv: mbstring, xdebug #optional, setup extensions
136+
extension-csv: mbstring, intl #optional, setup extensions
138137
ini-values-csv: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
139138
coverage: xdebug #optional, setup coverage driver
140-
pecl: true #optional, setup PECL
139+
pecl: false #optional, setup PECL
140+
141141
- name: Check PHP Version
142142
run: php -v
143+
143144
- name: Check Composer Version
144145
run: composer -V
146+
145147
- name: Check PHP Extensions
146148
run: php -m
147149
```
@@ -152,34 +154,37 @@ steps:
152154
jobs:
153155
run:
154156
runs-on: ${{ matrix.operating-system }}
155-
strategy:
156-
max-parallel: 15
157+
strategy:
157158
matrix:
158159
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
159160
php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3']
160161
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
161162
steps:
162163
- name: Checkout
163164
uses: actions/checkout@master
165+
164166
- name: Setup PHP
165167
uses: shivammathur/setup-php@master
166168
with:
167169
php-version: ${{ matrix.php-versions }}
168-
extension-csv: mbstring, xdebug #optional, setup extensions
170+
extension-csv: mbstring, intl #optional, setup extensions
169171
ini-values-csv: post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
170172
coverage: xdebug #optional, setup coverage driver
171-
pecl: true #optional, setup PECL
173+
pecl: false #optional, setup PECL
174+
172175
- name: Check PHP Version
173176
run: php -v
177+
174178
- name: Check Composer Version
175179
run: composer -V
180+
176181
- name: Check PHP Extensions
177182
run: php -m
178183
```
179184

180185
### Cache dependencies
181186

182-
You can persist composer's internal cache directory using the [`action/cache`](https://github.com/actions/cache) GitHub Action. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
187+
You can persist composer's internal cache directory using the [`action/cache`](https://github.com/actions/cache "GitHub Action to cache files") GitHub Action. Dependencies cached are loaded directly instead of downloading them while installation. The files cached are available across check-runs and will reduce the workflow execution time.
183188

184189
**Note:** Please do not cache `vendor` directory using `action/cache` as that will have side-effects.
185190

@@ -223,7 +228,7 @@ Examples for setting up this GitHub Action with different PHP Frameworks/Package
223228

224229
## :scroll: License
225230

226-
The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). This project has multiple [dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Dependencies for this PHP Action") and their licenses can be found in their respective repositories.
231+
The scripts and documentation in this project are released under the [MIT License](LICENSE "License for shivammathur/setup-php"). This project has multiple [dependencies](https://github.com/shivammathur/setup-php/network/dependencies "Dependencies for this PHP Action") and uses [various works](#bookmark-this-action-uses-the-following-works "Tools used by this action"). Their licenses can be found in their respective repositories.
227232

228233
## :+1: Contributions
229234

package-lock.json

+23-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-php",
3-
"version": "1.5.2",
3+
"version": "1.5.3",
44
"private": false,
55
"description": "Setup PHP for use with GitHub Actions",
66
"main": "lib/setup-php.js",

0 commit comments

Comments
 (0)