From 6d9fe330fd55f3ef0a839a4bbf2243560eee6710 Mon Sep 17 00:00:00 2001 From: Stefan Hagspiel Date: Tue, 13 Feb 2024 10:48:48 +0100 Subject: [PATCH] fix test conflict --- .github/workflows/codeception.yml | 2 +- .github/workflows/ecs.yml | 2 +- .github/workflows/php-stan.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml index 43f9431..b14b7e6 100644 --- 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 index 2e3b0c3..5a6f2ae 100644 --- 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 index e1277ad..784b17a 100644 --- 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: |