From 82693ababfc2c7cf2cbeed5ab8ce8f6219cbcc3e Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Thu, 9 Apr 2026 15:34:49 +0100 Subject: [PATCH] ci: combine general and lightweight e2e service tests into single job Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/ci.yml | 45 ++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9add7059d7..b2b09e0f01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -267,15 +267,15 @@ jobs: -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" appwrite test /usr/src/code/tests/unit - e2e_general: - name: Tests / E2E / General + e2e: + name: Tests / E2E runs-on: ubuntu-latest needs: build_development permissions: contents: read pull-requests: write steps: - - name: checkout + - name: Checkout repository uses: actions/checkout@v6 - name: Download Docker Image @@ -305,20 +305,21 @@ jobs: sleep 1 done - - name: Run General Tests - uses: itznotabug/php-retry@v3 - with: - max_attempts: 2 - retry_wait_seconds: 60 - timeout_minutes: 15 - job_id: ${{ job.check_run_id }} - github_token: ${{ secrets.GITHUB_TOKEN }} - test_dir: tests/e2e/General - command: >- - docker compose exec -T - -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" + - 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 Project ProjectWebhooks Storage Teams Tokens Users VCS; 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 + - name: Failure Logs if: failure() run: | @@ -338,30 +339,18 @@ jobs: database: ${{ fromJSON(needs.matrix.outputs.databases) }} mode: ${{ fromJSON(needs.matrix.outputs.modes) }} service: [ - Account, - Avatars, - Console, Databases, TablesDB, Functions, FunctionsSchedule, GraphQL, - Health, - Locale, Projects, Realtime, Sites, Proxy, - Storage, - Tokens, - Teams, - Users, - ProjectWebhooks, Webhooks, - VCS, Messaging, Migrations, - Project ] include: - service: Databases @@ -370,8 +359,6 @@ jobs: runner: blacksmith-4vcpu-ubuntu-2404 - service: Functions runner: blacksmith-4vcpu-ubuntu-2404 - - service: Avatars - runner: blacksmith-4vcpu-ubuntu-2404 - service: Realtime runner: blacksmith-4vcpu-ubuntu-2404 - service: TablesDB