fix test conflict

dachcom-digital · Feb 13, 2024 · 6d9fe33 · 6d9fe33
1 parent 7579fae
commit 6d9fe33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -123,9 +123,9 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
-                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
 
             -   name: Assets Install
                 run: |

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -103,9 +103,9 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
-                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
 
             -   name: Assets Install
                 run: |

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -103,9 +103,9 @@ jobs:
                     TEST_PIMCORE_VERSION: ${{ matrix.pimcore }}
                     TEST_SYMFONY_VERSION: ${{ matrix.symfony }}
                 run: |
+                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
-                    sed -i 's,\"require-dev"\: {,\"conflict"\: {\"league/csv"\: \">=9.11.0"\}\, \"require-dev"\: {,g' ${{ github.workspace }}/lib/test-bundle/composer.json
 
             -   name: Assets Install
                 run: |