Skip to content

Commit 05cf7ec

Browse files
authored
Merge pull request #1847 from franmomu/more_jobs_test
Allow install psr/log 2 and 3
2 parents 723c664 + c526cb1 commit 05cf7ec

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

.github/workflows/continuous-integration.yaml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,34 @@ jobs:
3030

3131
phpunit:
3232
runs-on: 'ubuntu-20.04'
33-
name: 'PHPUnit (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony_require }}, ES ${{ matrix.elasticsearch }})'
33+
name: 'PHPUnit (PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }} + ${{ matrix.dependencies }} deps, ES ${{ matrix.elasticsearch }})'
3434
timeout-minutes: 10
3535
env:
36-
SYMFONY_REQUIRE: "${{ matrix.symfony_require }}"
36+
SYMFONY_REQUIRE: "${{ matrix.symfony }}"
3737
strategy:
3838
matrix:
39+
php:
40+
- '7.4'
41+
- '8.0'
42+
- '8.1'
43+
symfony:
44+
- '4.4.*'
45+
- '5.4.*'
46+
- '6.0.*'
47+
elasticsearch:
48+
- '7.11.0'
49+
dependencies:
50+
- 'highest'
3951
include:
4052
- php: '7.4'
4153
elasticsearch: '7.0.0'
4254
dependencies: 'lowest'
43-
symfony_require: '4.4.*'
55+
symfony: '4.4.*'
56+
exclude:
4457
- php: '7.4'
45-
elasticsearch: '7.9.0'
58+
symfony: '6.0.*'
4659
dependencies: 'highest'
47-
symfony_require: '5.4.*'
48-
- php: '8.0'
4960
elasticsearch: '7.11.0'
50-
dependencies: 'highest'
51-
symfony_require: '5.4.*'
52-
- php: '8.1'
53-
elasticsearch: '7.11.0'
54-
dependencies: 'highest'
55-
symfony_require: '6.0.*'
5661
fail-fast: false
5762
steps:
5863
- name: 'Checkout'

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"require": {
3333
"php": "^7.4 || ^8.0",
3434
"pagerfanta/pagerfanta": "^2.4 || ^3.0",
35-
"psr/log": "^1.0",
35+
"psr/log": "^1.0 || ^2.0 || ^3.0",
3636
"ruflin/elastica": "^7.1",
3737
"symfony/console": "^4.4 || ^5.4 || ^6.0",
3838
"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",

0 commit comments

Comments
 (0)