ci: patch lowest conflicts

soyuka · Dec 13, 2023 · c68c1fd · c68c1fd
1 parent 0f540bb
commit c68c1fd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/.github/patch/lowest.patch b/.github/patch/lowest.patch
@@ -0,0 +1,12 @@
+diff --git a/composer.json b/composer.json
+index cce778ca2..99d6f81c1 100644
+--- a/composer.json
++++ b/composer.json
+@@ -107,6 +107,7 @@
+         "symfony/var-exporter": "<6.1.1",
+         "sebastian/comparator": ">=5.0",
+         "phpspec/prophecy": "<1.15",
++        "phpunit/phpunit": "<9.5",
+         "elasticsearch/elasticsearch": ">=8.0,<8.4"
+     },
+     "suggest": {
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -941,6 +941,8 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
       - name: Remove cache
         run: rm -Rf tests/Fixtures/app/var/cache/*
+      - name: Add phpunit conflict
+        run: git apply .github/patch/lowest.patch
       - name: Update project dependencies
         run: composer update --prefer-lowest --no-interaction --no-progress --ansi
       - name: Install PHPUnit