Skip to content

Commit a5eb057

Browse files
committed
remove actions
1 parent e090339 commit a5eb057

File tree

3 files changed

+25
-49
lines changed

3 files changed

+25
-49
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: 17 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,21 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v4
19-
- name: Populate .env
19+
- name: Run tests Neo4j 4
2020
run: |
21-
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 \
21+
docker compose run --rm \
3422
-e PHP_VERSION=${{ matrix.php }} \
3523
-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 \
24+
-f docker-compose-neo4j-4.yml \
25+
client sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
26+
docker compose run --rm \
4027
-e PHP_VERSION=${{ matrix.php }} \
41-
-e CONNECTION=bolt://neo4j:testtest@neo4j \
42-
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
28+
-e CONNECTION=neo4j://bolt:testtest@neo4j \
29+
-f docker-compose-neo4j-4.yml \
30+
client sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
31+
32+
docker compose -f docker-compose-neo4j-4.yml down --remove-orphans --volumes
33+
4334
tests-v5:
4435
runs-on: ubuntu-latest
4536
strategy:
@@ -49,27 +40,15 @@ jobs:
4940

5041
steps:
5142
- uses: actions/checkout@v4
52-
- name: Populate .env
53-
run: |
54-
echo "PHP_VERSION=${{ matrix.php }}" > .env
55-
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://
43+
- name: Run tests Neo4j 5
6544
run: |
6645
docker compose run --rm \
6746
-e PHP_VERSION=${{ matrix.php }} \
6847
-e CONNECTION=neo4j://neo4j:testtest@neo4j \
69-
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
70-
- name: Test bolt://
71-
run: |
48+
client sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
7249
docker compose run --rm \
7350
-e PHP_VERSION=${{ matrix.php }} \
74-
-e CONNECTION=bolt://neo4j:testtest@neo4j \
75-
client ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration
51+
-e CONNECTION=neo4j://bolt:testtest@neo4j \
52+
client sh -c "composer install && ./vendor/bin/phpunit -c phpunit.xml.dist --testsuite Integration"
53+
54+
docker compose down --remove-orphans --volumes

0 commit comments

Comments
 (0)