From 48374888ad11afafe62f9f10874953c29c963c2d Mon Sep 17 00:00:00 2001 From: jrfnl Date: Sun, 26 Nov 2023 03:53:21 +0100 Subject: [PATCH] GH Actions/test: PHP 8.3 has been released * Builds against PHP 8.3 are no longer allowed to fail. * Add _allowed to fail_ build against PHP 8.4. --- .github/workflows/integrationtest.yml | 13 ++++++++++--- tests/PHPCSVersions.php | 5 +++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integrationtest.yml b/.github/workflows/integrationtest.yml index c40ef159..c0d67c62 100644 --- a/.github/workflows/integrationtest.yml +++ b/.github/workflows/integrationtest.yml @@ -35,6 +35,7 @@ jobs: - '8.1' - '8.2' - '8.3' + - '8.4' composer: - 'v1' - 'v2' @@ -74,6 +75,9 @@ jobs: - php: '8.3' composer: '2.2' os: 'ubuntu-latest' + - php: '8.4' + composer: '2.2' + os: 'ubuntu-latest' - php: '7.2' composer: '2.2' @@ -96,6 +100,9 @@ jobs: - php: '8.3' composer: '2.2' os: 'windows-latest' + - php: '8.4' + composer: '2.2' + os: 'windows-latest' # Also test against the dev version of Composer for early warning about upcoming changes. - php: 'latest' @@ -108,7 +115,7 @@ jobs: name: "Integration test" - continue-on-error: ${{ matrix.php == '8.3' || matrix.composer == 'snapshot' }} + continue-on-error: ${{ matrix.php == '8.4' || matrix.composer == 'snapshot' }} steps: - name: Checkout code @@ -132,7 +139,7 @@ jobs: # Install dependencies and handle caching in one go. # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer - name: Install Composer dependencies - if: ${{ matrix.php != '8.3' }} + if: ${{ matrix.php != '8.4' }} uses: "ramsey/composer-install@v2" with: composer-options: '--optimize-autoloader' @@ -140,7 +147,7 @@ jobs: custom-cache-suffix: $(date -u "+%Y-%m") - name: Install Composer dependencies - if: ${{ matrix.php == '8.3' }} + if: ${{ matrix.php == '8.4' }} uses: "ramsey/composer-install@v2" with: composer-options: '--ignore-platform-reqs --optimize-autoloader' diff --git a/tests/PHPCSVersions.php b/tests/PHPCSVersions.php index 7e64c72a..0ea9e5ce 100644 --- a/tests/PHPCSVersions.php +++ b/tests/PHPCSVersions.php @@ -354,9 +354,10 @@ function ($version) { break; case '8.3': + case '8.4': /* - * At this point in time, it is unclear as of which PHPCS version PHP 8.2 will be supported. - * In other words: tests should only use dev-master/4.x when on PHP 8.2 for the time being. + * At this point in time, it is unclear as of which PHPCS version PHP 8.3/8.4 will be supported. + * In other words: tests should only use dev-master/4.x when on PHP 8.3/8.4 for the time being. */ $versions = array(); break;