Skip to content

Commit ad17442

Browse files
transistivetransistive
committed
remove actions
1 parent 541f4c1 commit ad17442

File tree

5 files changed

+41
-66
lines changed

5 files changed

+41
-66
lines changed

‎.github/workflows/integration-test-cluster-neo4j-4.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ jobs:
2424
2525
- name: Run integration tests
2626
run: |
27-
# bring up Neo4j cluster
28-
docker compose -f docker-compose-neo4j-4.yml up -d --build --remove-orphans
29-
3027
# install PHP deps and run PHPUnit inside the client container
3128
docker compose -f docker-compose-neo4j-4.yml run --rm client \
3229
sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"

‎.github/workflows/integration-test-cluster-neo4j-5.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
run: |
2121
echo "PHP_VERSION=${{ matrix.php }}" > .env
2222
echo "CONNECTION=neo4j://neo4j:testtest@server1" >> .env
23-
- uses: hoverkraft-tech/[email protected]
24-
name: Start services
25-
with:
26-
compose-file: "./docker-compose.yml"
27-
up-flags: "--build --remove-orphans"
28-
- name: Test
23+
24+
- name: Run integration tests
2925
run: |
30-
docker compose run --rm client composer install
31-
docker compose run --rm client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
26+
# install PHP deps and run PHPUnit inside the client container
27+
docker compose run --rm client \
28+
sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
29+
30+
# tear down services
31+
docker compose down --remove-orphans --volumes

‎.github/workflows/integration-test-single-server.yml

Lines changed: 27 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,22 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v4
19-
- name: Populate .env
19+
- name: Run tests Neo4j 4
2020
run: |
21+
2122
echo "PHP_VERSION=${{ matrix.php }}" > .env
22-
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" >> .env
23-
- uses: hoverkraft-tech/[email protected]
24-
name: Start services
25-
with:
26-
compose-file: "./docker-compose-neo4j-4.yml"
27-
up-flags: "--build --remove-orphans"
28-
- name: Composer install
29-
run: |
30-
docker compose -f docker-compose-neo4j-4.yml run client composer install
31-
- name: Test neo4j://
32-
run: |
33-
docker compose -f docker-compose-neo4j-4.yml run \
34-
-e PHP_VERSION=${{ matrix.php }} \
35-
-e CONNECTION=neo4j://neo4j:testtest@neo4j \
36-
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
37-
- name: Test bolt://
38-
run: |
39-
docker compose -f docker-compose-neo4j-4.yml run \
40-
-e PHP_VERSION=${{ matrix.php }} \
41-
-e CONNECTION=bolt://neo4j:testtest@neo4j \
42-
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
23+
echo "CONNECTION=bolt://neo4j:testtest@neo4j" >> .env
24+
25+
docker compose -f docker-compose-neo4j-4.yml up -d --build --remove-orphans --wait neo4j
26+
27+
docker compose -f docker-compose-neo4j-4.yml run --rm --no-deps \
28+
client sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
29+
30+
docker compose -f docker-compose-neo4j-4.yml run --rm --no-deps \
31+
client sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
32+
33+
docker compose -f docker-compose-neo4j-4.yml down --remove-orphans --volumes
34+
4335
tests-v5:
4436
runs-on: ubuntu-latest
4537
strategy:
@@ -53,23 +45,17 @@ jobs:
5345
run: |
5446
echo "PHP_VERSION=${{ matrix.php }}" > .env
5547
echo "CONNECTION=neo4j://neo4j:testtest@neo4j" >> .env
56-
- uses: hoverkraft-tech/[email protected]
57-
name: Start services
58-
with:
59-
compose-file: "./docker-compose.yml"
60-
up-flags: "--build"
61-
- name: Composer install
62-
run: |
63-
docker compose run --rm client composer install
64-
- name: Test neo4j://
48+
- name: Run tests Neo4j 5
6549
run: |
66-
docker compose run --rm \
67-
-e PHP_VERSION=${{ matrix.php }} \
68-
-e CONNECTION=neo4j://neo4j:testtest@neo4j \
69-
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
70-
- name: Test bolt://
71-
run: |
72-
docker compose run --rm \
73-
-e PHP_VERSION=${{ matrix.php }} \
74-
-e CONNECTION=bolt://neo4j:testtest@neo4j \
75-
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
50+
echo "PHP_VERSION=${{ matrix.php }}" > .env
51+
echo "CONNECTION=bolt://neo4j:testtest@neo4j" >> .env
52+
53+
docker compose up -d --build --remove-orphans --wait neo4j
54+
55+
docker compose run --rm --no-deps \
56+
client sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
57+
58+
docker compose run --rm --no-deps \
59+
client sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
60+
61+
docker compose down --remove-orphans --volumes

‎docker-compose-neo4j-4.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ services:
5151
server4:
5252
condition: service_healthy
5353
neo4j:
54-
networks:
55-
- neo4j
5654
image: neo4j:4.4-enterprise
5755
healthcheck:
5856
test: "wget -q --method=HEAD http://localhost:7474 || exit 1"
@@ -64,10 +62,12 @@ services:
6462
- "7474:7474"
6563
environment:
6664
<<: *common
67-
volumes:
68-
- ./tests/resources:/import
65+
NEO4J_dbms_connector_http_advertised__address: server1:7474
66+
NEO4J_dbms_connector_bolt_advertised__address: server1:7687
6967
env_file:
7068
- .env
69+
networks:
70+
- neo4j
7171
server1:
7272
image: neo4j:4.4-enterprise
7373
healthcheck:
@@ -77,8 +77,6 @@ services:
7777
retries: 5
7878
networks:
7979
- neo4j
80-
volumes:
81-
- ./tests/resources:/import
8280
environment:
8381
<<: *common-core
8482
NEO4J_causal__clustering_discovery__advertised__address: server1:5000
@@ -105,8 +103,6 @@ services:
105103
NEO4J_causal__clustering_raft__advertised__address: server2:7000
106104
NEO4J_dbms_connector_http_advertised__address: server2:7474
107105
NEO4J_dbms_connector_bolt_advertised__address: server2:7687
108-
volumes:
109-
- ./tests/resources:/import
110106
env_file:
111107
- .env
112108

@@ -126,8 +122,6 @@ services:
126122
NEO4J_causal__clustering_raft__advertised__address: server3:7000
127123
NEO4J_dbms_connector_http_advertised__address: server3:7474
128124
NEO4J_dbms_connector_bolt_advertised__address: server3:7687
129-
volumes:
130-
- ./tests/resources:/import
131125
env_file:
132126
- .env
133127

@@ -150,5 +144,3 @@ services:
150144
NEO4J_dbms_connector_bolt_advertised__address: server4:7687
151145
env_file:
152146
- .env
153-
volumes:
154-
- ./tests/resources:/import

‎tests/Integration/BoltDriverIntegrationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
use Bolt\error\ConnectException;
1717
use Exception;
18+
use Laudis\Neo4j\Basic\Driver;
1819
use Laudis\Neo4j\Bolt\BoltDriver;
19-
use Laudis\Neo4j\Neo4j\Neo4jDriver;
2020
use Laudis\Neo4j\Tests\EnvironmentAwareIntegrationTest;
2121
use Throwable;
2222

@@ -85,7 +85,7 @@ public function testInvalidSocket(): void
8585

8686
public function testBookmarkUpdates(): void
8787
{
88-
$session = Neo4jDriver::create($this->getUri(['bolt', 'neo4j'])->__toString())->createSession();
88+
$session = Driver::create($this->getUri(['bolt', 'neo4j'])->__toString())->createSession();
8989
$bookmark = $session->getLastBookmark();
9090
$this->assertEquals([], $bookmark->values());
9191
$this->assertTrue($bookmark->isEmpty());

0 commit comments

Comments
 (0)