Skip to content

Commit

Permalink
ci: Split qa and test workflow (#29)
Browse files Browse the repository at this point in the history
* ci: Split qa and test workflow

* fix: add conflicts to composer.json to fix --prefer-lowest tests
  • Loading branch information
lukadschaak authored Oct 6, 2023
1 parent 937817c commit e3ed5d8
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 48 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/qa.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Quality Assurance

on:
push:
branches: [ "v2" ]
pull_request:
branches: [ "v2" ]
workflow_dispatch:

permissions:
contents: read

jobs:
qa:
name: Quality Checks
runs-on: ubuntu-latest

steps:
- name: Git Checkout
uses: actions/checkout@v4

- name: PHP Setup
uses: shivammathur/setup-php@v2
with:
php-version: 8.1

- name: Validate composer.json
run: composer validate --strict

- name: Install dependencies
uses: ramsey/composer-install@v2

- name: Check CS-Fixer
run: composer cs:check

- name: Check PHPStan
run: composer phpstan
47 changes: 0 additions & 47 deletions .github/workflows/test-and-qa.yaml

This file was deleted.

42 changes: 42 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Tests

on:
push:
branches: [ "v2" ]
pull_request:
branches: [ "v2" ]
workflow_dispatch:

permissions:
contents: read

jobs:
tests:
name: PHPUnit with PHP ${{ matrix.php-version }} ${{ matrix.dependencies }}
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
include:
- php-version: "8.1"
dependencies: "lowest"
- php-version: "8.1"
dependencies: "highest"

steps:
- name: Git Checkout
uses: actions/checkout@v4

- name: PHP Setup
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}

- name: Install dependencies
uses: ramsey/composer-install@v2
with:
dependency-versions: ${{ matrix.dependencies }}

- name: Execute tests
run: composer tests
8 changes: 7 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,15 @@
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-phpunit": "^1.1",
"phpstan/phpstan-symfony": "^1.2",
"phpunit/phpunit": "^9.3",
"phpunit/phpunit": "^9.5",
"teamneusta/pimcore-testing-framework": "^0.11.0"
},
"conflict": {
"presta/sitemap-bundle": "<3.1",
"symfony/form": "<5.4",
"symfony/proxy-manager-bridge": "<5.4",
"symfony/routing": "<5.4"
},
"extra": {
"pimcore": {
"bundles": [
Expand Down

0 comments on commit e3ed5d8

Please sign in to comment.