Skip to content

Commit 1b91e21

Browse files
authored
Merge pull request #2 from kenjis/fix-github-actions
Update GitHub Actions
2 parents 748f65c + df22aa6 commit 1b91e21

3 files changed

Lines changed: 30 additions & 5 deletions

File tree

.github/workflows/coding-standards.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ on:
77
paths:
88
- 'src/**'
99
- 'tests/**'
10+
- composer.json
1011
- phpcs.xml
1112
pull_request:
1213
branches:
1314
- 1.x
1415
paths:
1516
- 'src/**'
1617
- 'tests/**'
18+
- composer.json
1719
- phpcs.xml
1820
- '.github/workflows/**'
1921
workflow_dispatch:
@@ -42,7 +44,7 @@ jobs:
4244
uses: actions/cache@v2
4345
with:
4446
path: ${{ steps.composer-cache.outputs.dir }}
45-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
47+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
4648
restore-keys: ${{ runner.os }}-composer-
4749

4850
- name: Install dependencies

.github/workflows/phpunit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ jobs:
5555
uses: actions/cache@v2
5656
with:
5757
path: ${{ steps.composer-cache.outputs.dir }}
58-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
59-
restore-keys: ${{ runner.os }}-composer-
58+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ matrix.dependencies }}-
59+
restore-keys: ${{ runner.os }}-composer-${{ matrix.dependencies }}-
6060

6161
- name: Install lowest dependencies
6262
if: ${{ matrix.dependencies == 'lowest' }}

.github/workflows/static-analysis.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
paths:
88
- 'src/**'
99
- 'tests/**'
10+
- composer.json
1011
- phpmd.xml
1112
- phpstan.neon
1213
- psalm.xml
@@ -16,6 +17,7 @@ on:
1617
paths:
1718
- 'src/**'
1819
- 'tests/**'
20+
- composer.json
1921
- phpmd.xml
2022
- phpstan.neon
2123
- psalm.xml
@@ -45,7 +47,7 @@ jobs:
4547
uses: actions/cache@v2
4648
with:
4749
path: ${{ steps.composer-cache.outputs.dir }}
48-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
50+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
4951
restore-keys: ${{ runner.os }}-composer-
5052

5153
- name: Install dependencies
@@ -72,6 +74,13 @@ jobs:
7274
id: composer-cache
7375
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
7476

77+
- name: Cache dependencies
78+
uses: actions/cache@v2
79+
with:
80+
path: ${{ steps.composer-cache.outputs.dir }}
81+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
82+
restore-keys: ${{ runner.os }}-composer-
83+
7584
- name: Install dependencies
7685
run: composer install --no-interaction --no-progress --prefer-dist
7786

@@ -98,7 +107,7 @@ jobs:
98107
uses: actions/cache@v2
99108
with:
100109
path: ${{ steps.composer-cache.outputs.dir }}
101-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
110+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
102111
restore-keys: ${{ runner.os }}-composer-
103112

104113
- name: Install dependencies
@@ -124,6 +133,13 @@ jobs:
124133
id: composer-cache
125134
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
126135

136+
- name: Cache dependencies
137+
uses: actions/cache@v2
138+
with:
139+
path: ${{ steps.composer-cache.outputs.dir }}
140+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
141+
restore-keys: ${{ runner.os }}-composer-
142+
127143
- name: Install dependencies
128144
run: composer install --no-interaction --no-progress --prefer-dist
129145

@@ -147,6 +163,13 @@ jobs:
147163
id: composer-cache
148164
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
149165

166+
- name: Cache dependencies
167+
uses: actions/cache@v2
168+
with:
169+
path: ${{ steps.composer-cache.outputs.dir }}
170+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
171+
restore-keys: ${{ runner.os }}-composer-
172+
150173
- name: Install dependencies
151174
run: |
152175
composer install --no-interaction --no-progress --prefer-dist

0 commit comments

Comments
 (0)