diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ee436d978..623793731 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,7 +7,7 @@ on: jobs: php-cs-fixer: runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 5 env: PHP_CS_FIXER_FUTURE_MODE: '1' steps: @@ -29,7 +29,7 @@ jobs: phpstan: runs-on: ubuntu-latest - timeout-minutes: 20 + timeout-minutes: 5 steps: - name: Checkout uses: actions/checkout@v3 @@ -53,7 +53,7 @@ jobs: phpunit: name: PHPUnit (PHP ${{ matrix.php }} + ${{ matrix.symfony-version }}) runs-on: ubuntu-latest - timeout-minutes: 20 + timeout-minutes: 10 strategy: matrix: include: @@ -64,14 +64,16 @@ jobs: bc: true - php: '8.0' symfony-version: '^5.4' - - php: '8.1' - symfony-version: '^5.4' - php: '8.1' symfony-version: '^6.3' - php: '8.2' symfony-version: '^6.3' + - php: '8.2' + symfony-version: '^7.0' - php: '8.3' symfony-version: '^6.3' + - php: '8.3' + symfony-version: '^7.0' fail-fast: false steps: @@ -108,7 +110,7 @@ jobs: - name: Upload test artifacts if: always() - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: phpunit-logs-php${{ matrix.php }} path: build/logs/phpunit diff --git a/README.md b/README.md index 8fb68ff71..67552d536 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Installation All the installation instructions are located in the documentation, check it for a specific version: -* [__2.0__](https://github.com/hwi/HWIOAuthBundle/blob/master/docs/1-setting_up_the_bundle.md) (current) - with support for Symfony: `^5.4` & `^6.1` (PHP: `^7.4`, `^8.0`), +* [__2.x__](https://github.com/hwi/HWIOAuthBundle/blob/master/docs/1-setting_up_the_bundle.md) (current) - with support for Symfony: `^5.4`, `^6.3` & `^7.0` (PHP: `^7.4`, `^8.0`), * [__1.4__](https://github.com/hwi/HWIOAuthBundle/blob/1.4/Resources/doc/1-setting_up_the_bundle.md) (unsupported) - with support for Symfony: `^4.4` & `^5.1` (PHP: `^7.3` & `^8.0`), @@ -22,7 +22,7 @@ Documentation The bulk of the documentation is stored in the `Resources/doc/index.md` file in this bundle. Read the documentation for version: -* [__2.0__](https://github.com/hwi/HWIOAuthBundle/blob/master/docs/index.md) +* [__2.x__](https://github.com/hwi/HWIOAuthBundle/blob/master/docs/index.md) * [__1.4__](https://github.com/hwi/HWIOAuthBundle/blob/1.4/Resources/doc/index.md) (unsupported) This bundle contains support for 58 different providers: