From cfb61b89d84acb20aa0e7cf3226df3fb43e5f9e7 Mon Sep 17 00:00:00 2001 From: Timm Friebe Date: Fri, 1 Mar 2024 21:37:50 +0100 Subject: [PATCH] Add PHP 8.2, 8.3 and PHP 8.4, upgrade XP & actions --- .github/workflows/ci.yml | 13 +++++-------- ChangeLog.md | 2 ++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb1f52a7..751e7b7b 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,11 +11,11 @@ jobs: if: "!contains(github.event.head_commit.message, 'skip ci')" name: PHP ${{ matrix.php-versions }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} - continue-on-error: ${{ matrix.php-versions == '8.1' }} + continue-on-error: ${{ matrix.php-versions >= '8.4' }} strategy: fail-fast: false matrix: - php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] + php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] os: [ubuntu-latest, windows-latest] steps: @@ -24,7 +24,7 @@ jobs: run: git config --system core.autocrlf false; git config --system core.eol lf - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up PHP ${{ matrix.php-versions }} uses: shivammathur/setup-php@v2 @@ -32,9 +32,6 @@ jobs: php-version: ${{ matrix.php-versions }} ini-values: date.timezone=Europe/Berlin - - name: Setup Problem Matchers for PHP - run: echo "::add-matcher::${{ runner.tool_cache }}/php.json" - - name: Validate composer.json and composer.lock run: composer validate @@ -43,7 +40,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2.1.3 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -51,7 +48,7 @@ jobs: - name: Install dependencies run: > - curl -sSL https://baltocdn.com/xp-framework/xp-runners/distribution/downloads/e/entrypoint/xp-run-8.5.3.sh > xp-run && + curl -sSL https://baltocdn.com/xp-framework/xp-runners/distribution/downloads/e/entrypoint/xp-run-8.8.0.sh > xp-run && composer install --prefer-dist && echo "vendor/autoload.php" > composer.pth diff --git a/ChangeLog.md b/ChangeLog.md index 015c3d0f..5d8cb60e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,6 +3,8 @@ FTP protocol support for the XP Framework ChangeLog ## ?.?.? / ????-??-?? +* Added PHP 8.2, 8.3 and 8.4 to the test matrix - @thekid + ## 11.0.3 / 2021-10-21 * Replaced deprecated util.DateUtil class with `util.Dates` - @thekid