Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit 76494d9

Browse files
localheinzlocalheinz
authored
Merge pull request #52 from ergebnis/feature/synchronize
Enhancement: Synchronize with ergebnis/php-library-template
2 parents 26ed14e + 5def96d commit 76494d9

File tree

3 files changed

+37
-22
lines changed

3 files changed

+37
-22
lines changed

‎.github/settings.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ branches:
1010
required_approving_review_count: 1
1111
required_status_checks:
1212
contexts:
13-
- "Coding Standards (7.2)"
14-
- "Dependency Analysis (7.4)"
15-
- "Static Code Analysis (7.4)"
13+
- "Coding Standards (7.2, locked)"
14+
- "Dependency Analysis (7.4, locked)"
15+
- "Static Code Analysis (7.4, locked)"
1616
- "Tests (7.2, lowest)"
1717
- "Tests (7.2, locked)"
1818
- "Tests (7.2, highest)"
@@ -22,8 +22,8 @@ branches:
2222
- "Tests (7.4, lowest)"
2323
- "Tests (7.4, locked)"
2424
- "Tests (7.4, highest)"
25-
- "Code Coverage (7.4)"
26-
- "Mutation Tests (7.4)"
25+
- "Code Coverage (7.4, locked)"
26+
- "Mutation Tests (7.4, locked)"
2727
- "codecov/patch"
2828
- "codecov/project"
2929
strict: false

‎.github/workflows/continuous-integration.yml

+31-16
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ jobs:
2121
php-version:
2222
- 7.2
2323

24+
dependencies:
25+
- locked
26+
2427
steps:
2528
- name: "Checkout"
2629
uses: actions/checkout@v2.0.0
2730

2831
- name: "Install PHP with extensions"
29-
uses: shivammathur/setup-php@1.6.0
32+
uses: shivammathur/setup-php@1.6.1
3033
with:
3134
coverage: none
3235
extensions: "mbstring"
@@ -39,14 +42,14 @@ jobs:
3942
uses: actions/cache@v1.0.3
4043
with:
4144
path: ~/.composer/cache
42-
key: php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
45+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
4346
restore-keys: |
44-
php-${{ matrix.php-version }}-composer-locked-
47+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
4548
4649
- name: "Install locked dependencies with composer"
4750
run: composer install --no-interaction --no-progress --no-suggest
4851

49-
- name: "Run localheinz/composer-normalize"
52+
- name: "Run ergebnis/composer-normalize"
5053
uses: docker://localheinz/composer-normalize-action:0.5.2
5154
with:
5255
args: --dry-run
@@ -75,12 +78,15 @@ jobs:
7578
php-version:
7679
- 7.4
7780

81+
dependencies:
82+
- locked
83+
7884
steps:
7985
- name: "Checkout"
8086
uses: actions/checkout@v2.0.0
8187

8288
- name: "Install PHP with extensions"
83-
uses: shivammathur/setup-php@1.6.0
89+
uses: shivammathur/setup-php@1.6.1
8490
with:
8591
coverage: none
8692
extensions: "mbstring"
@@ -90,15 +96,15 @@ jobs:
9096
uses: actions/cache@v1.0.3
9197
with:
9298
path: ~/.composer/cache
93-
key: php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
99+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
94100
restore-keys: |
95-
php-${{ matrix.php-version }}-composer-locked-
101+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
96102
97103
- name: "Install locked dependencies with composer"
98104
run: composer install --no-interaction --no-progress --no-suggest
99105

100106
- name: "Run maglnet/composer-require-checker"
101-
uses: docker://localheinz/composer-require-checker-action:1.1.1
107+
uses: docker://webfactory/composer-require-checker:2.0.0
102108

103109
static-code-analysis:
104110
name: "Static Code Analysis"
@@ -110,12 +116,15 @@ jobs:
110116
php-version:
111117
- 7.4
112118

119+
dependencies:
120+
- locked
121+
113122
steps:
114123
- name: "Checkout"
115124
uses: actions/checkout@v2.0.0
116125

117126
- name: "Install PHP with extensions"
118-
uses: shivammathur/setup-php@1.6.0
127+
uses: shivammathur/setup-php@1.6.1
119128
with:
120129
coverage: none
121130
extensions: "mbstring"
@@ -157,7 +166,7 @@ jobs:
157166
uses: actions/checkout@v2.0.0
158167

159168
- name: "Install PHP with extensions"
160-
uses: shivammathur/setup-php@1.6.0
169+
uses: shivammathur/setup-php@1.6.1
161170
with:
162171
coverage: none
163172
extensions: "mbstring"
@@ -202,12 +211,15 @@ jobs:
202211
php-version:
203212
- 7.4
204213

214+
dependencies:
215+
- locked
216+
205217
steps:
206218
- name: "Checkout"
207219
uses: actions/checkout@v2.0.0
208220

209221
- name: "Install PHP with extensions"
210-
uses: shivammathur/setup-php@1.6.0
222+
uses: shivammathur/setup-php@1.6.1
211223
with:
212224
coverage: pcov
213225
extensions: "mbstring"
@@ -217,9 +229,9 @@ jobs:
217229
uses: actions/cache@v1.0.3
218230
with:
219231
path: ~/.composer/cache
220-
key: php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
232+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
221233
restore-keys: |
222-
php-${{ matrix.php-version }}-composer-locked-
234+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
223235
224236
- name: "Install locked dependencies with composer"
225237
run: composer install --no-interaction --no-progress --no-suggest
@@ -242,12 +254,15 @@ jobs:
242254
php-version:
243255
- 7.4
244256

257+
dependencies:
258+
- locked
259+
245260
steps:
246261
- name: "Checkout"
247262
uses: actions/checkout@v2.0.0
248263

249264
- name: "Install PHP with extensions"
250-
uses: shivammathur/setup-php@1.6.0
265+
uses: shivammathur/setup-php@1.6.1
251266
with:
252267
coverage: pcov
253268
extensions: "mbstring"
@@ -257,9 +272,9 @@ jobs:
257272
uses: actions/cache@v1.0.3
258273
with:
259274
path: ~/.composer/cache
260-
key: php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('**/composer.lock') }}
275+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
261276
restore-keys: |
262-
php-${{ matrix.php-version }}-composer-locked-
277+
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
263278
264279
- name: "Install locked dependencies with composer"
265280
run: composer install --no-interaction --no-progress --no-suggest

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ coding-standards: vendor ## Fixes code style issues with friendsofphp/php-cs-fix
1212

1313
.PHONY: dependency-analysis
1414
dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker
15-
docker run --interactive --rm --tty --workdir=/app --volume ${PWD}:/app localheinz/composer-require-checker-action:1.1.1
15+
docker run --interactive --rm --tty --volume ${PWD}:/app webfactory/composer-require-checker:2.0.0
1616

1717
.PHONY: help
1818
help: ## Displays this list of targets with descriptions

0 commit comments

Comments
 (0)