update ci

transistive · transistive · commit 541f4c11511c · 2025-05-12T17:55:22.000+05:30
diff --git a/.github/workflows/integration-test-cluster-neo4j-4.yml b/.github/workflows/integration-test-cluster-neo4j-4.yml
@@ -5,29 +5,31 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1.31', '8.3.17']
+        php: ["8.1.31", "8.3.17"]
     name: "Running on PHP ${{ matrix.php }} in a Neo4j 4.4 cluster"
 
     steps:
       - uses: actions/checkout@v4
+
       - name: Populate .env
         run: |
           echo "PHP_VERSION=${{ matrix.php }}" > .env
-          echo "CONNECTION=neo4j://neo4j:testtest@core1" >> .env
-      - uses: hoverkraft-tech/compose-action@v2.0.2
-        name: Start services
-        with:
-          compose-file: './docker-compose-neo4j-4.yml'
-          up-flags: '--build --remove-orphans'
-      - name: Test
+          echo "CONNECTION=neo4j://neo4j:testtest@server1" >> .env
+
+      - name: Run integration tests
         run: |
-          docker compose run client composer install
-          docker compose run client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
+          # bring up Neo4j cluster
+          docker compose -f docker-compose-neo4j-4.yml up -d --build --remove-orphans
+
+          # install PHP deps and run PHPUnit inside the client container
+          docker compose -f docker-compose-neo4j-4.yml run --rm client \
+            sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
+
+          # tear down services
+          docker compose -f docker-compose-neo4j-4.yml down --remove-orphans --volumes
diff --git a/.github/workflows/integration-test-cluster-neo4j-5.yml b/.github/workflows/integration-test-cluster-neo4j-5.yml
@@ -5,15 +5,13 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1.31', '8.3.17']
+        php: ["8.1.31", "8.3.17"]
     name: "Running on PHP ${{ matrix.php }} with a Neo4j 5.20-enterprise cluster"
 
     steps:
@@ -22,12 +20,12 @@ jobs:
         run: |
           echo "PHP_VERSION=${{ matrix.php }}" > .env
           echo "CONNECTION=neo4j://neo4j:testtest@server1" >> .env
-      - uses: hoverkraft-tech/compose-action@v2.0.2
+      - uses: hoverkraft-tech/compose-action@v2.2.0
         name: Start services
         with:
-          compose-file: './docker-compose.yml'
-          up-flags: '--build --remove-orphans'
+          compose-file: "./docker-compose.yml"
+          up-flags: "--build --remove-orphans"
       - name: Test
         run: |
-          docker compose run client composer install
-          docker compose run client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
+          docker compose run --rm client composer install
+          docker compose run --rm client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
diff --git a/.github/workflows/integration-test-single-server.yml b/.github/workflows/integration-test-single-server.yml
@@ -5,15 +5,13 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 jobs:
   tests-v4:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1.31', '8.3.17']
+        php: ["8.1.31", "8.3.17"]
     name: "Running on PHP ${{ matrix.php }} with a Neo4j 4 instance connecting over all available protocols"
 
     steps:
@@ -22,31 +20,31 @@ jobs:
         run: |
           echo "PHP_VERSION=${{ matrix.php }}" > .env
           echo "CONNECTION=neo4j://neo4j:testtest@neo4j" >> .env
-      - uses: hoverkraft-tech/compose-action@v2.0.2
+      - uses: hoverkraft-tech/compose-action@v2.2.0
         name: Start services
         with:
-          compose-file: './docker-compose-neo4j-4.yml'
-          up-flags: '--build --remove-orphans'
+          compose-file: "./docker-compose-neo4j-4.yml"
+          up-flags: "--build --remove-orphans"
       - name: Composer install
         run: |
-          docker compose run client composer install
+          docker compose -f docker-compose-neo4j-4.yml run client composer install
       - name: Test neo4j://
         run: |
-          docker compose run \
+          docker compose -f docker-compose-neo4j-4.yml run \
             -e PHP_VERSION=${{ matrix.php }} \
             -e CONNECTION=neo4j://neo4j:testtest@neo4j \
             client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
       - name: Test bolt://
         run: |
-          docker compose run \
+          docker compose -f docker-compose-neo4j-4.yml run \
             -e PHP_VERSION=${{ matrix.php }} \
             -e CONNECTION=bolt://neo4j:testtest@neo4j \
             client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
   tests-v5:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1.31', '8.3.17']
+        php: ["8.1.31", "8.3.17"]
     name: "Running on PHP ${{ matrix.php }} with a Neo4j 5 instance connecting over all available protocols"
 
     steps:
@@ -55,23 +53,23 @@ jobs:
         run: |
           echo "PHP_VERSION=${{ matrix.php }}" > .env
           echo "CONNECTION=neo4j://neo4j:testtest@neo4j" >> .env
-      - uses: hoverkraft-tech/compose-action@v2.0.2
+      - uses: hoverkraft-tech/compose-action@v2.2.0
         name: Start services
         with:
-          compose-file: './docker-compose.yml'
-          up-flags: '--build'
+          compose-file: "./docker-compose.yml"
+          up-flags: "--build"
       - name: Composer install
         run: |
-          docker compose run client composer install
+          docker compose run --rm client composer install
       - name: Test neo4j://
         run: |
-          docker compose run \
+          docker compose run --rm \
             -e PHP_VERSION=${{ matrix.php }} \
             -e CONNECTION=neo4j://neo4j:testtest@neo4j \
             client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
       - name: Test bolt://
         run: |
-          docker compose run \
+          docker compose run --rm \
             -e PHP_VERSION=${{ matrix.php }} \
             -e CONNECTION=bolt://neo4j:testtest@neo4j \
             client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -5,8 +5,7 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
+
 jobs:
   php-cs-fixer:
     name: "Lint & Analyse"
@@ -18,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3.17'
+          php-version: "8.3.17"
 
       - name: Cache Composer dependencies
         uses: actions/cache@v4
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -5,16 +5,14 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     name: "Running Unit Tests"
     strategy:
-        matrix:
-            php: ['8.1.31', '8.2.27', '8.3.17']
+      matrix:
+        php: ["8.1.31", "8.2.27", "8.3.17"]
 
     steps:
       - uses: actions/checkout@v4
@@ -33,7 +31,7 @@ jobs:
 
       - name: Install dependencies
         run: composer install
-        
+
       - uses: php-actions/phpunit@v4
         with:
           configuration: phpunit.xml.dist
diff --git a/docker-compose-neo4j-4.yml b/docker-compose-neo4j-4.yml
@@ -9,7 +9,7 @@ x-shared:
 x-shared-cluster:
   &common-cluster
   <<: *common
-  NEO4J_causal__clustering_initial__discovery__members: core1:5000,core2:5000,core3:5000
+  NEO4J_causal__clustering_initial__discovery__members: server1:5000,server2:5000,server3:5000
   NEO4J_dbms_memory_pagecache_size: 100M
   NEO4J_dbms_memory_heap_initial__size: 100M
   NEO4J_causal__clustering_discovery__listen__address: 0.0.0.0:5000
@@ -42,23 +42,14 @@ services:
     depends_on:
       neo4j:
         condition: service_healthy
-  testkit-backend:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        PHP_VERSION: "${PHP_VERSION-8.1}"
-        WITH_XDEBUG: true
-    working_dir: /opt/project
-    volumes:
-      - .:/opt/project
-    command: php /opt/project/testkit-backend/index.php
-    networks:
-      - neo4j
-    depends_on:
-      - neo4j
-    ports:
-      - "9876:9876"
+      server1:
+        condition: service_healthy
+      server2:
+        condition: service_healthy
+      server3:
+        condition: service_healthy
+      server4:
+        condition: service_healthy
   neo4j:
     networks:
       - neo4j
@@ -77,7 +68,7 @@ services:
       - ./tests/resources:/import
     env_file:
       - .env
-  core1:
+  server1:
     image: neo4j:4.4-enterprise
     healthcheck:
       test: "wget -q --method=HEAD http://localhost:7474 || exit 1"
@@ -90,15 +81,15 @@ services:
       - ./tests/resources:/import
     environment:
       <<: *common-core
-      NEO4J_causal__clustering_discovery__advertised__address: core1:5000
-      NEO4J_causal__clustering_transaction__advertised__address: core1:6000
-      NEO4J_causal__clustering_raft__advertised__address: core1:7000
-      NEO4J_dbms_connector_http_advertised__address: core1:7474
-      NEO4J_dbms_connector_bolt_advertised__address: core1:7687
+      NEO4J_causal__clustering_discovery__advertised__address: server1:5000
+      NEO4J_causal__clustering_transaction__advertised__address: server1:6000
+      NEO4J_causal__clustering_raft__advertised__address: server1:7000
+      NEO4J_dbms_connector_http_advertised__address: server1:7474
+      NEO4J_dbms_connector_bolt_advertised__address: server1:7687
     env_file:
       - .env
 
-  core2:
+  server2:
     image: neo4j:4.4-enterprise
     healthcheck:
       test: "wget -q --method=HEAD http://localhost:7474 || exit 1"
@@ -109,17 +100,17 @@ services:
       - neo4j
     environment:
       <<: *common-core
-      NEO4J_causal__clustering_discovery__advertised__address: core2:5000
-      NEO4J_causal__clustering_transaction__advertised__address: core2:6000
-      NEO4J_causal__clustering_raft__advertised__address: core2:7000
-      NEO4J_dbms_connector_http_advertised__address: core2:7474
-      NEO4J_dbms_connector_bolt_advertised__address: core2:7687
+      NEO4J_causal__clustering_discovery__advertised__address: server2:5000
+      NEO4J_causal__clustering_transaction__advertised__address: server2:6000
+      NEO4J_causal__clustering_raft__advertised__address: server2:7000
+      NEO4J_dbms_connector_http_advertised__address: server2:7474
+      NEO4J_dbms_connector_bolt_advertised__address: server2:7687
     volumes:
       - ./tests/resources:/import
     env_file:
       - .env
 
-  core3:
+  server3:
     image: neo4j:4.4-enterprise
     healthcheck:
       test: "wget -q --method=HEAD http://localhost:7474 || exit 1"
@@ -130,17 +121,17 @@ services:
       - neo4j
     environment:
       <<: *common-core
-      NEO4J_causal__clustering_discovery__advertised__address: core3:5000
-      NEO4J_causal__clustering_transaction__advertised__address: core3:6000
-      NEO4J_causal__clustering_raft__advertised__address: core3:7000
-      NEO4J_dbms_connector_http_advertised__address: core3:7474
-      NEO4J_dbms_connector_bolt_advertised__address: core3:7687
+      NEO4J_causal__clustering_discovery__advertised__address: server3:5000
+      NEO4J_causal__clustering_transaction__advertised__address: server3:6000
+      NEO4J_causal__clustering_raft__advertised__address: server3:7000
+      NEO4J_dbms_connector_http_advertised__address: server3:7474
+      NEO4J_dbms_connector_bolt_advertised__address: server3:7687
     volumes:
       - ./tests/resources:/import
     env_file:
       - .env
 
-  readreplica1:
+  server4:
     image: neo4j:4.4-enterprise
     healthcheck:
       test: "wget -q --method=HEAD http://localhost:7474 || exit 1"
@@ -152,11 +143,11 @@ services:
     environment:
       <<: *common-cluster
       NEO4J_dbms_mode: READ_REPLICA
-      NEO4J_causal__clustering_discovery__advertised__address: readreplica1:5000
-      NEO4J_causal__clustering_transaction__advertised__address: readreplica1:6000
-      NEO4J_causal__clustering_raft__advertised__address: readreplica1:7000
-      NEO4J_dbms_connector_http_advertised__address: readreplica1:7474
-      NEO4J_dbms_connector_bolt_advertised__address: readreplica1:7687
+      NEO4J_causal__clustering_discovery__advertised__address: server4:5000
+      NEO4J_causal__clustering_transaction__advertised__address: server4:6000
+      NEO4J_causal__clustering_raft__advertised__address: server4:7000
+      NEO4J_dbms_connector_http_advertised__address: server4:7474
+      NEO4J_dbms_connector_bolt_advertised__address: server4:7687
     env_file:
       - .env
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,6 +53,14 @@ services:
     depends_on:
       neo4j:
         condition: service_healthy
+      server1:
+        condition: service_healthy
+      server2:
+        condition: service_healthy
+      server3:
+        condition: service_healthy
+      server4:
+        condition: service_healthy
   neo4j:
     <<: *common
     image: neo4j:5.23-community
