Skip to content

Refactor CI configuration to streamline PHP version and dependency management #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spomky wants to merge 1 commit into
base: 7.7.x
Choose a base branch
from
Open

Refactor CI configuration to streamline PHP version and dependency management #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
244 changes: 31 additions & 213 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

matrix:
php-version:
- "8.1"
- "8.5"

dependencies:
- "highest"
Expand Down Expand Up @@ -61,10 +61,6 @@ jobs:

matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
- "8.5"

steps:
Expand All @@ -84,97 +80,7 @@ jobs:
tools: "${{ env.TOOLS }}"

- name: "Lint PHP"
uses: "overtrue/[email protected]"

install:
name: "Install dependencies"

needs: "lint"

runs-on: "ubuntu-latest"

continue-on-error: ${{ matrix.experimental }}

strategy:
fail-fast: false

matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
- "8.5"

dependencies:
- "lowest"
- "highest"

experimental: [false]

include:
- php-version: "8.1"
dependencies: "locked"
experimental: false
- php-version: "8.2"
dependencies: "locked"
experimental: false
- php-version: "8.3"
dependencies: "locked"
experimental: false
- php-version: "8.4"
dependencies: "highest"
experimental: false
- php-version: "8.5"
dependencies: "highest"
experimental: false

steps:
- name: "Checkout"
uses: "actions/checkout@v6"
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
fetch-depth: 0

- name: "Install PHP"
uses: "shivammathur/[email protected]"
with:
php-version: "${{ matrix.php-version }}"
extensions: "${{ env.PHP_EXTENSIONS }}"
ini-values: "${{ env.PHP_INI_VALUES }}"
coverage: "none"
tools: "${{ env.TOOLS }}"

- name: "Install lowest dependencies"
if: "${{ matrix.dependencies == 'lowest' }}"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ env.COMPOSER_OPTIONS }} --prefer-stable"

- name: "Install highest dependencies"
if: "${{ matrix.dependencies == 'highest' && matrix.experimental == false }}"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ env.COMPOSER_OPTIONS }} --prefer-stable"

- name: "Install highest dependencies (Experimental)"
if: "${{ matrix.dependencies == 'highest' && matrix.experimental == true }}"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ env.COMPOSER_OPTIONS }} --prefer-stable --ignore-platform-reqs"

- name: "Install locked dependencies"
if: "${{ matrix.dependencies == 'locked' }}"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ env.COMPOSER_OPTIONS }}"

- name: "Check dependencies with composer"
run: "composer outdated --direct"
uses: "overtrue/[email protected]"

coding-standards:
name: "Check Coding Standards with PHPCS"
Expand All @@ -190,10 +96,10 @@ jobs:

matrix:
php-version:
- "8.1"
- "8.5"

dependencies:
- "highest"
- "locked"

steps:
- name: "Checkout"
Expand All @@ -215,7 +121,7 @@ jobs:
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ env.COMPOSER_OPTIONS }} --prefer-stable"
composer-options: "${{ env.COMPOSER_OPTIONS }}"

- name: "Run squizlabs/php_codesniffer"
run: "vendor/bin/phpcs --report=checkstyle -q | cs2pr"
Expand All @@ -234,10 +140,6 @@ jobs:

matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
- "8.5"

dependencies:
Expand Down Expand Up @@ -272,54 +174,6 @@ jobs:
name: "UnitTests with PHPUnit"

needs: "lint"

runs-on: "ubuntu-latest"

continue-on-error: false

strategy:
fail-fast: false

matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
- "8.5"

dependencies:
- "highest"

steps:
- name: "Checkout"
uses: "actions/checkout@v6"
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
fetch-depth: 0

- name: "Install PHP"
uses: "shivammathur/[email protected]"
with:
php-version: "${{ matrix.php-version }}"
extensions: "${{ env.PHP_EXTENSIONS }}"
ini-values: "${{ env.PHP_INI_VALUES }}"
coverage: "none"
tools: "${{ env.TOOLS }}"

- name: "Update dependencies with composer"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ env.COMPOSER_OPTIONS }} --prefer-stable"

- name: "Run unit tests with phpunit/phpunit"
run: "vendor/bin/phpunit -c phpunit.xml.dist --no-coverage --colors"

code-coverage:
name: "Code Coverage with PHPUnit"

needs: "tests"

runs-on: "ubuntu-latest"

Expand All @@ -329,15 +183,19 @@ jobs:
fail-fast: false

matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
- "8.5"

dependencies:
- "highest"
include:
- php-version: "8.1"
dependencies: "lowest"
- php-version: "8.1"
dependencies: "highest"
- php-version: "8.2"
dependencies: "highest"
- php-version: "8.3"
dependencies: "highest"
- php-version: "8.4"
dependencies: "highest"
- php-version: "8.5"
dependencies: "highest"

steps:
- name: "Checkout"
Expand All @@ -355,62 +213,15 @@ jobs:
coverage: "xdebug"
tools: "${{ env.TOOLS }}"

- name: "Update dependencies with composer"
- name: "Install lowest dependencies"
if: "${{ matrix.dependencies == 'lowest' }}"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "${{ env.COMPOSER_OPTIONS }} --prefer-stable"

- name: "Collect code coverage with Xdebug and phpunit/phpunit"
run: "vendor/bin/phpunit -c phpunit.xml.dist --exclude-group compare --coverage-clover=coverage.clover --coverage-text --colors"

- name: "Upload coverage to Codecov"
uses: "codecov/[email protected]"
with:
file: "coverage.clover"
flags: "phpunit"
verbose: false

comparison-checks:
name: "Compare results with PHPUnit"

needs: "tests"

runs-on: "ubuntu-latest"

continue-on-error: false

strategy:
fail-fast: false

matrix:
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
- "8.5"

dependencies:
- "highest"

steps:
- name: "Checkout"
uses: "actions/checkout@v6"
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
fetch-depth: 0

- name: "Install PHP"
uses: "shivammathur/[email protected]"
with:
php-version: "${{ matrix.php-version }}"
extensions: "${{ env.PHP_EXTENSIONS }}"
ini-values: "${{ env.PHP_INI_VALUES }}"
coverage: "none"
tools: "${{ env.TOOLS }}"

- name: "Update dependencies with composer"
- name: "Install highest dependencies"
if: "${{ matrix.dependencies == 'highest' }}"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
Expand All @@ -422,8 +233,15 @@ jobs:
mkdir -p resources
cp /tmp/browscap.ini resources/browscap.ini

- name: "Compare get_browser to browscap-php results"
run: "vendor/bin/phpunit -c phpunit.xml.dist --no-coverage --group compare --colors"
- name: "Run unit tests with phpunit/phpunit"
run: "vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.clover --coverage-text --colors"

- name: "Upload coverage to Codecov"
uses: "codecov/[email protected]"
with:
file: "coverage.clover"
flags: "phpunit"
verbose: false

roave-backwards-compatibility-check:
name: "Check for Backward Compatibility breaks"
Expand Down
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"symfony/filesystem": "^6.4.0 || ^7.0.0"
},
"require-dev": {
"doctrine/coding-standard": "^12.0.0",
"doctrine/coding-standard": "^14.0.0",
"mikey179/vfsstream": "^1.6.11",
"phpstan/extension-installer": "^1.3.1",
"phpstan/phpstan": "^1.10.43",
"phpstan/phpstan-beberlei-assert": "^1.1.2",
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"phpstan/extension-installer": "^1.4.3",
"phpstan/phpstan": "^1.12.9",
"phpstan/phpstan-beberlei-assert": "^1.1.3",
"phpstan/phpstan-deprecation-rules": "^1.2.1",
"phpstan/phpstan-phpunit": "^1.3.15",
"phpunit/phpunit": "^10.4.2"
},
Expand Down
Loading