Skip to content

Commit c68c1fd

Browse files
committed
ci: patch lowest conflicts
1 parent 0f540bb commit c68c1fd

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

.github/patch/lowest.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/composer.json b/composer.json
2+
index cce778ca2..99d6f81c1 100644
3+
--- a/composer.json
4+
+++ b/composer.json
5+
@@ -107,6 +107,7 @@
6+
"symfony/var-exporter": "<6.1.1",
7+
"sebastian/comparator": ">=5.0",
8+
"phpspec/prophecy": "<1.15",
9+
+ "phpunit/phpunit": "<9.5",
10+
"elasticsearch/elasticsearch": ">=8.0,<8.4"
11+
},
12+
"suggest": {

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -941,6 +941,8 @@ jobs:
941941
restore-keys: ${{ runner.os }}-composer-
942942
- name: Remove cache
943943
run: rm -Rf tests/Fixtures/app/var/cache/*
944+
- name: Add phpunit conflict
945+
run: git apply .github/patch/lowest.patch
944946
- name: Update project dependencies
945947
run: composer update --prefer-lowest --no-interaction --no-progress --ansi
946948
- name: Install PHPUnit

0 commit comments

Comments
 (0)