fix: CI pipeline

teamneusta · Oct 25, 2024 · eb088ea · eb088ea
1 parent e56e392
commit eb088ea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main" ]
   workflow_dispatch:
 
 permissions:
@@ -21,10 +20,13 @@ jobs:
         include:
           - php-version: "8.1"
             dependencies: "lowest"
+            tests: --fail-on-risky
           - php-version: "8.1"
             dependencies: "highest"
+            tests: --fail-on-risky
           - php-version: "8.2"
             dependencies: "highest"
+            tests: --fail-on-risky
 
     steps:
       - name: Git Checkout
@@ -40,5 +42,9 @@ jobs:
         with:
           dependency-versions: ${{ matrix.dependencies }}
 
+      - name: Add Pimcore Admin UI
+        run: composer require --dev pimcore/admin-ui-classic-bundle --no-interaction
+        if: matrix.dependencies == 'highest'
+
       - name: Execute tests
-        run: composer tests
+        run: composer tests -- ${{ matrix.tests }}
diff --git a/composer.json b/composer.json
@@ -32,6 +32,7 @@
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.62",
     "jangregor/phpstan-prophecy": "^1.0.2",
+    "laminas/laminas-zendframework-bridge": "^1.8",
     "phpspec/prophecy-phpunit": "^2.2",
     "phpstan/phpstan": "^1.11.10",
     "phpstan/phpstan-phpunit": "^1.4",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
     bootstrap="tests/bootstrap.php"
     cacheResultFile=".phpunit.cache/test-results"
     colors="true"
-    failOnRisky="true"
     failOnWarning="true"
 >
     <php>