Skip to content

Commit 5316142

Browse files
committed
Install tools per step to prevent errors
1 parent 2b7f965 commit 5316142

File tree

1 file changed

+8
-24
lines changed

1 file changed

+8
-24
lines changed

.github/workflows/push.yml

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,14 @@ on:
44
- master
55
pull_request:
66
name: Qa workflow
7+
env:
8+
phiveGPGKeys: 4AA394086372C20A,D2CCAC42F6295E7D,E82B2FB314E9906E,8A03EA3B385DBAA1
79
jobs:
810
setup:
911
runs-on: ubuntu-latest
1012
steps:
1113
- uses: actions/checkout@v2
1214

13-
- name: Restore/cache tools folder
14-
uses: actions/cache@v2
15-
with:
16-
path: tools
17-
key: all-tools-${{ github.sha }}
18-
restore-keys: |
19-
all-tools-${{ github.sha }}-
20-
all-tools-
21-
2215
- name: composer
2316
uses: docker://composer
2417
env:
@@ -33,12 +26,6 @@ jobs:
3326
with:
3427
args: check --config-file ./composer-require-config.json composer.json
3528

36-
- name: Install phive
37-
run: make install-phive
38-
39-
- name: Install PHAR dependencies
40-
run: tools/phive.phar --no-progress install --copy --trust-gpg-keys 4AA394086372C20A,D2CCAC42F6295E7D,E82B2FB314E9906E,8E730BA25823D8B5,8A03EA3B385DBAA1 --force-accept-unsigned
41-
4229
phpunit-with-coverage:
4330
runs-on: ubuntu-latest
4431
name: Unit tests
@@ -102,15 +89,12 @@ jobs:
10289
php-version: ${{ matrix.php-versions }}
10390
extensions: ${{ env.extensions }}
10491
ini-values: memory_limit=2G, display_errors=On, error_reporting=-1
92+
tools: phive
10593

106-
- name: Restore/cache tools folder
107-
uses: actions/cache@v2
108-
with:
109-
path: tools
110-
key: all-tools-${{ github.sha }}
111-
restore-keys: |
112-
all-tools-${{ github.sha }}-
113-
all-tools-
94+
- name: Install PHAR dependencies
95+
env:
96+
GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
97+
run: phive --no-progress install --copy --trust-gpg-keys ${{ env.phiveGPGKeys }} --force-accept-unsigned
11498

11599
- name: Get composer cache directory
116100
id: composer-cache
@@ -204,7 +188,7 @@ jobs:
204188
uses: shivammathur/setup-php@v2
205189
with:
206190
php-version: ${{ matrix.php-versions }}
207-
extension: ${{ env.extensions }}
191+
extensions: ${{ env.extensions }}
208192
tools: psalm
209193
ini-values: memory_limit=2G, display_errors=On, error_reporting=-1
210194

0 commit comments

Comments
 (0)