diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c739873..983ec15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,9 +22,6 @@ jobs: uses: ./.github/workflows/reusable-build-binary.yml verify: - name: Validate binary on PHP ${{ matrix.php }} - runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} needs: - bundle @@ -47,6 +44,12 @@ jobs: - '8.4' - '8.5' - '8.6' + - '8.7' + + continue-on-error: ${{ matrix.php == '8.7' }} + + name: Validate binary on PHP ${{ matrix.php }} + runs-on: ubuntu-latest steps: - name: Checkout code @@ -70,12 +73,13 @@ jobs: run: php ./parallel-lint.phar src/ publish: - name: Add binary to release - runs-on: ubuntu-latest needs: - bundle - verify + name: Add binary to release + runs-on: ubuntu-latest + steps: - name: Download PHAR file uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b8b8719..bfd9bfb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,6 +19,7 @@ jobs: lint: name: Run style linter runs-on: ubuntu-latest + steps: - name: Setup PHP uses: shivammathur/setup-php@eb7c497e18156a6bbabfef1d3a82760b9eda3962 # 2.40.0 @@ -51,9 +52,6 @@ jobs: uses: ./.github/workflows/reusable-build-binary.yml test: - name: Run tests on PHP ${{ matrix.php }} - runs-on: ubuntu-latest - continue-on-error: ${{ matrix.php == '8.6' }} needs: - bundle @@ -76,6 +74,12 @@ jobs: - '8.4' - '8.5' - '8.6' + - '8.7' + + continue-on-error: ${{ matrix.php == '8.7' }} + + name: Run tests on PHP ${{ matrix.php }} + runs-on: ubuntu-latest steps: - name: Checkout code @@ -96,19 +100,13 @@ jobs: run: composer remove --dev php-parallel-lint/php-code-style --no-update --no-interaction - name: Install Composer dependencies - if: ${{ matrix.php != '8.6' }} uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 with: + # For PHP "nightly", we need to install with ignore platform reqs as not all dependencies allow it. + composer-options: ${{ matrix.php == '8.7' && '--ignore-platform-req=php+' || '' }} # Bust the cache at least once a month - output format: YYYY-MM. custom-cache-suffix: $(date -u "+%Y-%m") - - name: "Install Composer dependencies (PHP nightly, ignore PHP reqs)" - if: ${{ matrix.php == '8.6' }} - uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - with: - composer-options: --ignore-platform-req=php - custom-cache-suffix: $(date -u "+%Y-%m") - - name: 'Integration test 1 - linting own code, no colors' continue-on-error: true run: ./parallel-lint --exclude vendor --exclude tests/fixtures --no-colors . diff --git a/README.md b/README.md index 6608ec4..1b446d3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Additionally `blame` can be used to show commits that introduced the breakage. Running parallel jobs in PHP is inspired by Nette framework tests. -The application is officially supported for use with PHP 5.3 to 8.5. +The application is officially supported for use with PHP 5.3 to 8.6. ## Table of contents