From 49b0836f6ebc1747fbc7f5bf4ffb282ab5671f2e Mon Sep 17 00:00:00 2001 From: Luka Dschaak Date: Tue, 29 Nov 2022 19:07:57 +0100 Subject: [PATCH 1/2] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9c89324..f3b690f 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "teamneusta/pimcore-translation-migration", + "name": "teamneusta/pimcore-translation-migration-bundle", "type": "pimcore-bundle", "description": "Migrates Symfony translations to Pimcore", "license": "GPL-3.0-or-later", From fa172a2dc125d64cc0b4bf5b4d9f9567af879cd1 Mon Sep 17 00:00:00 2001 From: Luka Dschaak Date: Tue, 29 Nov 2022 19:59:12 +0100 Subject: [PATCH 2/2] fix pipeline: add composer install to all workflows and use composer.json for hash --- .github/workflows/test-and-qa.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-and-qa.yaml b/.github/workflows/test-and-qa.yaml index a395346..b13ed03 100644 --- a/.github/workflows/test-and-qa.yaml +++ b/.github/workflows/test-and-qa.yaml @@ -18,9 +18,6 @@ jobs: php-version: '8.1' - uses: actions/checkout@v3 - - name: Copy .env.test.local - run: php -r "file_exists('.env.test.local') || copy('.env.test', '.env.test.local');" - - name: Validate composer.json and composer.lock run: composer validate --strict @@ -29,9 +26,7 @@ jobs: uses: actions/cache@v3 with: path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php- + key: ${{ runner.os }}-php-${{ hashFiles('**/composer.json') }} - name: Install Dependencies run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist @@ -68,9 +63,10 @@ jobs: uses: actions/cache@v3 with: path: vendor - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-php- + key: ${{ runner.os }}-php-${{ hashFiles('**/composer.json') }} + + - name: Install Dependencies + run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist - name: Execute tests (Unit and Feature tests) via PHPUnit run: composer tests