Merge branch 'feat-sites' into feat-add-tests-for-sites

.github/workflows/tests.yml

@@ -131,6 +131,11 @@ jobs:
             Messaging,
             Migrations
           ]
+        tables-mode: [
+          'Project',
+          'Shared V1',
+          'Shared V2',
+        ]
 
     steps:
       - name: checkout
@@ -149,16 +154,36 @@ jobs:
           docker compose up -d
           sleep 60
 
-      - name: Run ${{matrix.service}} Tests
-        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+      - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
+        run: |
+          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
+            echo "Using shared tables V1"
+            export _APP_DATABASE_SHARED_TABLES=database_db_main
+            export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
+          elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
+            echo "Using shared tables V2"
+            export _APP_DATABASE_SHARED_TABLES=database_db_main
+            export _APP_DATABASE_SHARED_TABLES_V1=
+          else
+            echo "Using project tables"
+            export _APP_DATABASE_SHARED_TABLES=
+            export _APP_DATABASE_SHARED_TABLES_V1=
+          fi
 
-      - name: Run ${{matrix.service}} Shared Tables Tests
-        run: _APP_DATABASE_SHARED_TABLES=database_db_main docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+          echo 'Sleep 1 minute, as temporary fix for v4rc executor startup (image pulling)'
+          sleep 60
+      
+          docker compose exec -T \
+            -e _APP_DATABASE_SHARED_TABLES \
+            -e _APP_DATABASE_SHARED_TABLES_V1 \
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug
 
   benchmarking:
     name: Benchmark
     runs-on: ubuntu-latest
     needs: setup
+    permissions:
+      pull-requests: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -219,6 +244,7 @@ jobs:
           path: benchmark.json
           retention-days: 7
       - name: Find Comment
+        if: github.event.pull_request.head.repo.full_name == github.repository
         uses: peter-evans/find-comment@v3
         id: fc
         with:
@@ -226,9 +252,10 @@ jobs:
           comment-author: 'github-actions[bot]'
           body-includes: Benchmark results
       - name: Comment on PR
+        if: github.event.pull_request.head.repo.full_name == github.repository
         uses: peter-evans/create-or-update-comment@v4
         with:
           comment-id: ${{ steps.fc.outputs.comment-id }}
           issue-number: ${{ github.event.pull_request.number }}
           body-path: benchmark.txt
-          edit-mode: replace
+          edit-mode: replace