Skip to content

Commit 2d819bf

Browse files
committed
Fix: Matrix
1 parent 34d4306 commit 2d819bf

File tree

2 files changed

+36
-15
lines changed

2 files changed

+36
-15
lines changed

.github/settings.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,32 @@ branches:
2525
- context: "Tests (7.4, 8.5.19, locked)"
2626
- context: "Tests (7.4, 8.5.19, lowest)"
2727
- context: "Tests (7.4, 9.0.0, highest)"
28-
- context: "Tests (7.4, 9.0.0, locked)"
2928
- context: "Tests (7.4, 9.0.0, lowest)"
3029
- context: "Tests (8.0, 8.5.19, highest)"
3130
- context: "Tests (8.0, 8.5.19, locked)"
3231
- context: "Tests (8.0, 8.5.19, lowest)"
3332
- context: "Tests (8.0, 9.0.0, highest)"
34-
- context: "Tests (8.0, 9.0.0, locked)"
3533
- context: "Tests (8.0, 9.0.0, lowest)"
3634
- context: "Tests (8.1, 10.0.0, highest)"
37-
- context: "Tests (8.1, 10.0.0, locked)"
3835
- context: "Tests (8.1, 10.0.0, lowest)"
3936
- context: "Tests (8.1, 8.5.19, highest)"
4037
- context: "Tests (8.1, 8.5.19, locked)"
4138
- context: "Tests (8.1, 8.5.19, lowest)"
4239
- context: "Tests (8.1, 9.0.0, highest)"
43-
- context: "Tests (8.1, 9.0.0, locked)"
4440
- context: "Tests (8.1, 9.0.0, lowest)"
4541
- context: "Tests (8.2, 10.0.0, highest)"
46-
- context: "Tests (8.2, 10.0.0, locked)"
4742
- context: "Tests (8.2, 10.0.0, lowest)"
4843
- context: "Tests (8.2, 8.5.19, highest)"
4944
- context: "Tests (8.2, 8.5.19, locked)"
5045
- context: "Tests (8.2, 8.5.19, lowest)"
5146
- context: "Tests (8.2, 9.0.0, highest)"
52-
- context: "Tests (8.2, 9.0.0, locked)"
5347
- context: "Tests (8.2, 9.0.0, lowest)"
5448
- context: "Tests (8.3, 10.0.0, highest)"
55-
- context: "Tests (8.3, 10.0.0, locked)"
5649
- context: "Tests (8.3, 10.0.0, lowest)"
5750
- context: "Tests (8.3, 8.5.19, highest)"
5851
- context: "Tests (8.3, 8.5.19, locked)"
5952
- context: "Tests (8.3, 8.5.19, lowest)"
6053
- context: "Tests (8.3, 9.0.0, highest)"
61-
- context: "Tests (8.3, 9.0.0, locked)"
6254
- context: "Tests (8.3, 9.0.0, lowest)"
6355
strict: false
6456
restrictions:

.github/workflows/integrate.yaml

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -466,45 +466,72 @@ jobs:
466466

467467
phpunit-version:
468468
- "8.5.19"
469-
- "9.0.0"
470469

471470
dependencies:
472471
- "lowest"
473472
- "locked"
474473
- "highest"
475474

476475
include:
476+
- php-version: "7.4"
477+
phpunit-version: "9.0.0"
478+
dependencies: "lowest"
479+
480+
- php-version: "7.4"
481+
phpunit-version: "9.0.0"
482+
dependencies: "highest"
483+
484+
- php-version: "8.0"
485+
phpunit-version: "9.0.0"
486+
dependencies: "lowest"
487+
488+
- php-version: "8.0"
489+
phpunit-version: "9.0.0"
490+
dependencies: "highest"
491+
477492
- php-version: "8.1"
478-
phpunit-version: "10.0.0"
493+
phpunit-version: "9.0.0"
479494
dependencies: "lowest"
480495

496+
- php-version: "8.1"
497+
phpunit-version: "9.0.0"
498+
dependencies: "highest"
499+
481500
- php-version: "8.1"
482501
phpunit-version: "10.0.0"
483-
dependencies: "locked"
502+
dependencies: "lowest"
484503

485504
- php-version: "8.1"
486505
phpunit-version: "10.0.0"
487506
dependencies: "highest"
488507

489508
- php-version: "8.2"
490-
phpunit-version: "10.0.0"
509+
phpunit-version: "9.0.0"
491510
dependencies: "lowest"
492511

512+
- php-version: "8.2"
513+
phpunit-version: "9.0.0"
514+
dependencies: "highest"
515+
493516
- php-version: "8.2"
494517
phpunit-version: "10.0.0"
495-
dependencies: "locked"
518+
dependencies: "lowest"
496519

497520
- php-version: "8.2"
498521
phpunit-version: "10.0.0"
499522
dependencies: "highest"
500523

501524
- php-version: "8.3"
502-
phpunit-version: "10.0.0"
525+
phpunit-version: "9.0.0"
503526
dependencies: "lowest"
504527

528+
- php-version: "8.3"
529+
phpunit-version: "9.0.0"
530+
dependencies: "highest"
531+
505532
- php-version: "8.3"
506533
phpunit-version: "10.0.0"
507-
dependencies: "locked"
534+
dependencies: "lowest"
508535

509536
- php-version: "8.3"
510537
phpunit-version: "10.0.0"
@@ -545,9 +572,11 @@ jobs:
545572
run: "composer config platform.php --ansi --unset"
546573

547574
- name: "Remove incompatible dependencies with composer"
575+
if: "matrix.dependencies != 'locked'"
548576
run: "composer remove ergebnis/php-cs-fixer-config psalm/plugin-phpunit vimeo/psalm --ansi --dev --no-interaction --no-progress"
549577

550578
- name: "Require phpunit/phpunit:^${{ matrix.phpunit-version }}"
579+
if: "matrix.dependencies != 'locked'"
551580
run: "composer require phpunit/phpunit:^${{ matrix.phpunit-version }} --ansi --no-interaction --no-progress --update-with-all-dependencies"
552581

553582
- name: "Install ${{ matrix.dependencies }} dependencies with composer"

0 commit comments

Comments
 (0)