From 1d28d2d62f96335560b14fe141eb071fcd89c210 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Thu, 9 Apr 2026 15:40:47 +0100 Subject: [PATCH] ci: use phpunit e2e suite with paratest for combined e2e job Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/ci.yml | 19 +++++++------------ phpunit.xml | 27 ++++++++++----------------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04977c1096..4fa66d55ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -307,18 +307,13 @@ jobs: - name: Run Tests timeout-minutes: 60 - run: | - docker compose exec -T \ - -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \ - appwrite test /usr/src/code/tests/e2e/General - - for service in Account Avatars Console Health Locale Messaging Project Projects ProjectWebhooks Proxy Storage Teams Tokens Users VCS Webhooks; do - docker compose exec -T \ - -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \ - appwrite vendor/bin/paratest --processes $(nproc) --functional \ - "/usr/src/code/tests/e2e/Services/$service" \ - --exclude-group abuseEnabled --exclude-group screenshots - done + run: >- + docker compose exec -T + -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" + appwrite vendor/bin/paratest --processes $(nproc) --functional + --configuration /usr/src/code/phpunit.xml + --testsuite e2e + --exclude-group abuseEnabled --exclude-group screenshots - name: Failure Logs if: failure() diff --git a/phpunit.xml b/phpunit.xml index 9748c5a5c8..8d251cfaa6 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -17,30 +17,23 @@ ./tests/unit - ./tests/e2e/Client.php ./tests/e2e/General - ./tests/e2e/Scopes - ./tests/e2e/Services/Teams - ./tests/e2e/Services/Realtime ./tests/e2e/Services/Account - ./tests/e2e/Services/Users - ./tests/e2e/Services/Console ./tests/e2e/Services/Avatars - ./tests/e2e/Services/Databases - ./tests/e2e/Services/GraphQL + ./tests/e2e/Services/Console ./tests/e2e/Services/Health ./tests/e2e/Services/Locale - ./tests/e2e/Services/Projects - ./tests/e2e/Services/Storage - ./tests/e2e/Services/Tokens - ./tests/e2e/Services/Webhooks - ./tests/e2e/Services/ProjectWebhooks ./tests/e2e/Services/Messaging - ./tests/e2e/Services/Migrations ./tests/e2e/Services/Project - ./tests/e2e/Services/Functions/FunctionsBase.php - ./tests/e2e/Services/Functions/FunctionsCustomServerTest.php - ./tests/e2e/Services/Functions/FunctionsCustomClientTest.php + ./tests/e2e/Services/Projects + ./tests/e2e/Services/ProjectWebhooks + ./tests/e2e/Services/Proxy + ./tests/e2e/Services/Storage + ./tests/e2e/Services/Teams + ./tests/e2e/Services/Tokens + ./tests/e2e/Services/Users + ./tests/e2e/Services/VCS + ./tests/e2e/Services/Webhooks