diff --git a/.github/actions/php/prepare/action.yaml b/.github/actions/php/prepare/action.yaml index 68477611..238267fb 100644 --- a/.github/actions/php/prepare/action.yaml +++ b/.github/actions/php/prepare/action.yaml @@ -10,13 +10,10 @@ inputs: description: 'PHP Extensions' required: false default: 'apcu, amqp, protobuf, intl, gmp, sockets, zip, opcache, pdo_pgsql' - work-directory: - description: 'Working Directory' - required: false - default: 'packages/core-v2' runs: using: composite + steps: - name: Setup PHP ${{ inputs.php }} uses: shivammathur/setup-php@v2 @@ -25,12 +22,10 @@ runs: php-version: ${{ inputs.php }} - name: Validate Composer - working-directory: ${{ inputs.work-directory }} shell: bash run: composer validate - name: Get Composer Cache Directory - working-directory: ${{ inputs.work-directory }} shell: bash id: composer-cache run: | @@ -40,9 +35,9 @@ runs: uses: actions/cache@v5 with: path: ${{ steps.composer-cache.outputs.dir }} - key: core-v2-composer-${{ hashFiles(format('{0}/composer.lock', inputs.work-directory)) }} + key: core-v2-composer-${{ hashFiles('composer.lock')) }} restore-keys: | - ${{ runner.os }}-core-v2-composer- + core-v2-composer- - name: Install Dependencies uses: nick-invision/retry@v2 @@ -50,5 +45,4 @@ runs: timeout_minutes: 5 max_attempts: 3 command: | - cd ${{ inputs.work-directory }} composer install --prefer-dist --no-interaction --no-progress diff --git a/.github/workflows/reusable-php-checks-v2.yaml b/.github/workflows/reusable-php-checks-v2.yaml index f153b691..406ed63c 100644 --- a/.github/workflows/reusable-php-checks-v2.yaml +++ b/.github/workflows/reusable-php-checks-v2.yaml @@ -32,11 +32,9 @@ jobs: - uses: rees46/workflow/.github/actions/php/prepare@master - name: Composer Audit - working-directory: ${{ inputs.working-directory }} run: composer audit - name: Security Advisories - working-directory: ${{ inputs.working-directory }} run: composer require --dev roave/security-advisories:dev-latest phpstan: @@ -58,7 +56,6 @@ jobs: - uses: rees46/workflow/.github/actions/php/prepare@master - name: Static Analysis - working-directory: ${{ inputs.working-directory }} run: composer linter:check -- --error-format=github --ansi php-cs-fixer: @@ -80,7 +77,6 @@ jobs: - uses: rees46/workflow/.github/actions/php/prepare@master - name: Check Code Style - working-directory: ${{ inputs.working-directory }} run: composer phpcs:check tests: @@ -119,17 +115,13 @@ jobs: - uses: rees46/workflow/.github/actions/php/prepare@master - name: Symfony Container Tests - working-directory: ${{ inputs.working-directory }} run: composer test:container - name: Unit Tests - working-directory: ${{ inputs.working-directory }} run: composer test:unit - name: Integration Tests - working-directory: ${{ inputs.working-directory }} run: composer test:integration - name: Functional Tests - working-directory: ${{ inputs.working-directory }} run: composer test:feature