diff --git a/.github/workflows/check-cs.yml b/.github/workflows/check-cs.yml index 450f291..18a74c9 100644 --- a/.github/workflows/check-cs.yml +++ b/.github/workflows/check-cs.yml @@ -10,6 +10,12 @@ on: # Allow manually triggering the workflow. workflow_dispatch: +# Cancels all previous workflow runs for the same branch that have not yet completed. +concurrency: + # The concurrency group contains the workflow name and the branch name. + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: fix-style: name: Fix Code Style @@ -31,7 +37,7 @@ jobs: - name: Install dependencies run: | - composer update --prefer-dist --no-suggest --no-progress + composer update --prefer-dist --no-suggest --no-progress --no-interaction - name: Check Code Style run: vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 3f74358..f355e7e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,6 +10,12 @@ on: # Allow manually triggering the workflow. workflow_dispatch: +# Cancels all previous workflow runs for the same branch that have not yet completed. +concurrency: + # The concurrency group contains the workflow name and the branch name. + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: php-tests: runs-on: ubuntu-latest @@ -19,7 +25,7 @@ jobs: strategy: matrix: - php: ['8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4'] + php: ['8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4'] dependency-version: ['prefer-stable'] experimental: [false] @@ -33,8 +39,11 @@ jobs: - php: '8.0' dependency-version: 'prefer-lowest' experimental: false - - php: '8.1' + dependency-version: 'prefer-lowest' + experimental: false + + - php: '8.2' dependency-version: 'prefer-stable' experimental: true @@ -56,21 +65,21 @@ jobs: # Remove the coding standards package as it has a higher minimum PHP # requirement and would prevent running the tests on older PHP versions. - name: 'Composer: remove CS dependency' - run: composer remove --dev --no-update dms/coding-standard + run: composer remove --dev --no-update dms/coding-standard --no-interaction - name: 'Composer: update PHPUnit for testing lowest' if: ${{ matrix.dependency-version == 'prefer-lowest' }} - run: composer require --no-update phpunit/phpunit:"^9.0" + run: composer require --no-update phpunit/phpunit:"^9.0" --no-interaction - name: Install dependencies - normal - if: ${{ matrix.php < 8.1 }} + if: ${{ matrix.php < 8.2 }} run: | - composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress + composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --no-interaction - name: Install dependencies - ignore platform reqs - if: ${{ matrix.php >= 8.1 }} + if: ${{ matrix.php >= 8.2 }} run: | - composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --ignore-platform-reqs + composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --ignore-platform-reqs --no-interaction - name: Execute Unit Tests run: vendor/bin/phpunit