Skip to content

Commit 6da1801

Browse files
authored
Merge pull request #121 from jrfnl/feature/ghactions-switch-to-composer-cache-action
GH Actions: simplify Composer caching
2 parents c86c54c + f59436e commit 6da1801

File tree

1 file changed

+13
-43
lines changed

1 file changed

+13
-43
lines changed

.github/workflows/push.yml

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@ jobs:
4545
GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4646
run: phive --no-progress install --copy --trust-gpg-keys ${{ env.phiveGPGKeys }} --force-accept-unsigned
4747

48-
- name: Get composer cache directory
49-
id: composer-cache
50-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
51-
52-
- name: Install Composer dependencies
53-
run: |
54-
composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
48+
- name: Install Composer dependencies & cache dependencies
49+
uses: "ramsey/composer-install@v1"
50+
with:
51+
composer-options: --optimize-autoloader
5552

5653
- name: Run PHPUnit
5754
run: php tools/phpunit
@@ -111,19 +108,10 @@ jobs:
111108
GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
112109
run: phive --no-progress install --copy --trust-gpg-keys ${{ env.phiveGPGKeys }} phpunit:^8.5
113110

114-
- name: Get composer cache directory
115-
id: composer-cache
116-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
117-
118-
- name: Cache dependencies
119-
uses: actions/cache@v2
111+
- name: Install Composer dependencies & cache dependencies
112+
uses: "ramsey/composer-install@v1"
120113
with:
121-
path: ${{ steps.composer-cache.outputs.dir }}
122-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
123-
restore-keys: ${{ runner.os }}-composer-
124-
125-
- name: Install dependencies
126-
run: composer install --no-interaction --prefer-dist --optimize-autoloader
114+
composer-options: --optimize-autoloader
127115

128116
- name: Run PHPUnit
129117
run: php tools/phpunit
@@ -210,19 +198,10 @@ jobs:
210198
extensions: ${{ env.extensions }}
211199
ini-values: memory_limit=2G, display_errors=On, error_reporting=-1
212200

213-
- name: Get composer cache directory
214-
id: composer-cache
215-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
216-
217-
- name: Cache dependencies
218-
uses: actions/cache@v2
201+
- name: Install Composer dependencies & cache dependencies
202+
uses: "ramsey/composer-install@v1"
219203
with:
220-
path: ${{ steps.composer-cache.outputs.dir }}
221-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
222-
restore-keys: ${{ runner.os }}-composer-
223-
224-
- name: Install dependencies
225-
run: composer install --no-interaction --prefer-dist --optimize-autoloader
204+
composer-options: --optimize-autoloader
226205

227206
- name: Run psalm
228207
run: vendor/bin/psalm.phar
@@ -276,19 +255,10 @@ jobs:
276255
ini-values: memory_limit=2G, display_errors=On, error_reporting=-1, blackfire.agent_socket=tcp://localhost:8707
277256
coverage: none
278257

279-
- name: Get Composer Cache Directory
280-
id: composer-cache
281-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
282-
283-
- name: Cache dependencies
284-
uses: actions/cache@v2
258+
- name: Install Composer dependencies & cache dependencies
259+
uses: "ramsey/composer-install@v1"
285260
with:
286-
path: ${{ steps.composer-cache.outputs.dir }}
287-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
288-
restore-keys: ${{ runner.os }}-composer-
289-
290-
- name: Install dependencies
291-
run: composer install --prefer-dist --no-progress --no-suggest
261+
composer-options: --optimize-autoloader
292262

293263
- name: Install phpbench
294264
run: |

0 commit comments

Comments
 (0)