From a70e94a67b999e87ad73ec22a500717f2f96f5ad Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Wed, 18 Feb 2026 13:41:08 +1300 Subject: [PATCH] fix: resolve merge corruption in tests.yml workflow The e2e_service_test job's command block had corrupted shell syntax from a bad merge - orphaned elif/else without matching if, and duplicate if-elif blocks for DB adapter env vars. The set-db-env step already sets these via GITHUB_ENV, making the inline exports redundant. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/tests.yml | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7792852cf1..2da6fd4109 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -263,8 +263,6 @@ jobs: - name: Run ${{ matrix.service }} tests with Project table mode uses: itznotabug/php-retry@v3 - env: - _APP_DB_SCHEMA: appwrite with: max_attempts: 3 timeout_minutes: 30 @@ -273,36 +271,8 @@ jobs: test_dir: tests/e2e/Services/${{ matrix.service }} command: | echo "Using project tables" - - elif [ "${{ matrix.db_adapter }}" = "MONGODB" ]; then - export _APP_DB_ADAPTER=mongodb - export _APP_DB_HOST=mongodb - export _APP_DB_PORT=27017 - export _APP_DB_SCHEMA=appwrite - else SERVICE_PATH="/usr/src/code/tests/e2e/Services/${{ matrix.service }}" - # Set DB Adapter Specific ENV Vars using if-elif - if [ "${{ matrix.db_adapter }}" = "MARIADB" ]; then - export _APP_DB_ADAPTER=mariadb - export _APP_DB_HOST=mariadb - export _APP_DB_PORT=3306 - export _APP_DB_SCHEMA=appwrite - elif [ "${{ matrix.db_adapter }}" = "MONGODB" ]; then - export _APP_DB_ADAPTER=mongodb - export _APP_DB_HOST=mongodb - export _APP_DB_PORT=5432 - export _APP_DB_SCHEMA=appwrite - elif [ "${{ matrix.db_adapter }}" = "POSTGRESQL" ]; then - export _APP_DB_ADAPTER=postgresql - export _APP_DB_HOST=postgresql - export _APP_DB_PORT=5432 - export _APP_DB_SCHEMA=appwrite - else - echo "Unknown DB adapter: ${{ matrix.db_adapter }}" - exit 1 - fi - echo "Running with paratest (parallel) for: ${{ matrix.service }}" docker compose exec -T \ -e _APP_DATABASE_SHARED_TABLES="" \ @@ -310,7 +280,7 @@ jobs: -e _APP_DB_ADAPTER="${{ env._APP_DB_ADAPTER }}" \ -e _APP_DB_HOST="${{ env._APP_DB_HOST }}" \ -e _APP_DB_PORT="${{ env._APP_DB_PORT }}" \ - -e _APP_DB_SCHEMA="${{ env._APP_DB_SCHEMA }}" \ + -e _APP_DB_SCHEMA=appwrite \ -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \ appwrite vendor/bin/paratest --processes $(nproc) --functional "$SERVICE_PATH" --exclude-group abuseEnabled --exclude-group screenshots