Skip to content

Commit 17c7db1

Browse files
exaby73exaby73
authored
Merge pull request #199 from neo4j-php/ISSUE-198
ci: Fix pipeline
2 parents eb9674d + c3e836b commit 17c7db1

File tree

70 files changed

+603
-528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+603
-528
lines changed

‎.github/workflows/integration-test-aura.yml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
name: Integration Tests
2-
3-
on:
4-
push:
5-
branches:
6-
- main
7-
pull_request:
8-
branches:
9-
- main
10-
11-
jobs:
12-
tests:
13-
runs-on: ubuntu-latest
14-
env:
15-
CONNECTION: ${{ secrets.AURA_PRO }}
16-
name: "Running on all provided Aura instances"
17-
18-
steps:
19-
- uses: actions/checkout@v2
20-
- name: Cache Composer dependencies
21-
uses: actions/cache@v2
22-
with:
23-
path: /tmp/composer-cache
24-
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
25-
- uses: php-actions/composer@v6
26-
with:
27-
progress: yes
28-
php_version: 8.0
29-
version: 2
30-
- name: clean database
31-
run: CONNECTION=$CONNECTION php tests/clean-database.php
32-
- uses: php-actions/phpunit@v3
33-
with:
34-
configuration: phpunit.xml.dist
35-
php_version: 8.0
36-
memory_limit: 1024M
37-
version: 9
38-
testsuite: Integration
39-
bootstrap: vendor/autoload.php
1+
#name: Integration Tests
2+
#
3+
#on:
4+
# push:
5+
# branches:
6+
# - main
7+
# pull_request:
8+
# branches:
9+
# - main
10+
#
11+
#jobs:
12+
# tests:
13+
# runs-on: ubuntu-latest
14+
# env:
15+
# CONNECTION: ${{ secrets.AURA_PRO }}
16+
# name: "Running on all provided Aura instances"
17+
#
18+
# steps:
19+
# - uses: actions/checkout@v2
20+
# - name: Cache Composer dependencies
21+
# uses: actions/cache@v2
22+
# with:
23+
# path: /tmp/composer-cache
24+
# key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
25+
# - uses: php-actions/composer@v6
26+
# with:
27+
# progress: yes
28+
# php_version: 8.1
29+
# version: 2
30+
# - name: clean database
31+
# run: CONNECTION=$CONNECTION php tests/clean-database.php
32+
# - uses: php-actions/phpunit@v3
33+
# with:
34+
# configuration: phpunit.xml.dist
35+
# php_version: 8.1
36+
# memory_limit: 1024M
37+
# version: 10
38+
# testsuite: Integration
39+
# bootstrap: vendor/autoload.php

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
env:
1515
CONNECTION: neo4j://neo4j:testtest@localhost:7688
16-
name: "Running on PHP 8.0 in a Neo4j 4.4 cluster"
16+
name: "Running on PHP 8.1 in a Neo4j 4.4 cluster"
1717

1818
steps:
1919
- uses: actions/checkout@v2
@@ -25,14 +25,14 @@ jobs:
2525
- uses: php-actions/composer@v6
2626
with:
2727
progress: yes
28-
php_version: 8.0
28+
php_version: 8.1
2929
version: 2
3030
- uses: php-actions/phpunit@v3
3131
with:
3232
configuration: phpunit.xml.dist
33-
php_version: 8.0
33+
php_version: 8.1
3434
memory_limit: 1024M
35-
version: 9
35+
version: 10
3636
testsuite: Integration
3737
bootstrap: vendor/autoload.php
3838

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
env:
1515
CONNECTION: neo4j://neo4j:testtest@localhost:7687
16-
name: "Running on PHP 8.0 with a Neo4j 5.10-enterprise cluster"
16+
name: "Running on PHP 8.1 with a Neo4j 5.20-enterprise cluster"
1717

1818
steps:
1919
- uses: actions/checkout@v2
@@ -25,20 +25,20 @@ jobs:
2525
- uses: php-actions/composer@v6
2626
with:
2727
progress: yes
28-
php_version: 8.0
28+
php_version: 8.1
2929
version: 2
3030
- uses: php-actions/phpunit@v3
3131
with:
3232
configuration: phpunit.xml.dist
33-
php_version: 8.0
33+
php_version: 8.1
3434
memory_limit: 1024M
35-
version: 9
35+
version: 10
3636
testsuite: Integration
3737
bootstrap: vendor/autoload.php
3838

3939
services:
4040
server1:
41-
image: neo4j:5.10-enterprise
41+
image: neo4j:5.20-enterprise
4242
ports:
4343
- 7687:7687
4444
- 7473:7473
@@ -59,7 +59,7 @@ jobs:
5959
--health-timeout "15s"
6060
--health-retries "5"
6161
server2:
62-
image: neo4j:5.10-enterprise
62+
image: neo4j:5.20-enterprise
6363
ports:
6464
- 8687:7687
6565
- 8473:7473
@@ -80,7 +80,7 @@ jobs:
8080
--health-timeout "15s"
8181
--health-retries "5"
8282
server3:
83-
image: neo4j:5.10-enterprise
83+
image: neo4j:5.20-enterprise
8484
ports:
8585
- 9474:7474
8686
- 9473:7473
@@ -101,7 +101,7 @@ jobs:
101101
--health-timeout "15s"
102102
--health-retries "5"
103103
read-server4:
104-
image: neo4j:5.10-enterprise
104+
image: neo4j:5.20-enterprise
105105
ports:
106106
- 10474:7474
107107
- 10473:7473

‎.github/workflows/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
- uses: php-actions/composer@v6
2424
with:
2525
progress: yes
26-
php_version: 8.2
26+
php_version: 8.1
2727
version: 2
2828
- uses: php-actions/phpunit@v3
2929
with:
3030
configuration: phpunit.xml.dist
31-
php_version: 8.2
31+
php_version: 8.1
3232
memory_limit: 1024M
33-
version: 9
33+
version: 10
3434
testsuite: Unit
3535
bootstrap: vendor/autoload.php

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ composer.lock
1313
.env
1414
/docs/_build
1515
cachegrind.out.*
16+
.phpunit.cache/

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.0-cli
1+
FROM php:8.1-cli
22
RUN apt-get update \
33
&& apt-get install -y \
44
libzip-dev \

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"psr/http-factory": "^1.0",
2929
"psr/http-client": "^1.0",
3030
"php-http/message": "^1.0",
31-
"stefanak-michal/bolt": "^6.0",
31+
"stefanak-michal/bolt": "^7.0.1",
3232
"symfony/polyfill-php80": "^1.2",
3333
"psr/simple-cache": ">=2.0",
3434
"ext-json": "*",
@@ -43,7 +43,7 @@
4343
"composer-runtime-api": "Install composer 2 for auto detection of version in user agent"
4444
},
4545
"require-dev": {
46-
"phpunit/phpunit": "^9.0",
46+
"phpunit/phpunit": "^10.0",
4747
"nyholm/psr7": "^1.3",
4848
"nyholm/psr7-server": "^1.0",
4949
"kriswallsmith/buzz": "^1.2",

‎docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
- .env
5353
neo4j:
5454
<<: *common
55-
image: neo4j:5.10-community
55+
image: neo4j:5.20-community
5656
hostname: neo4j
5757
networks:
5858
- neo4j

‎phpunit.xml.dist

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
<phpunit colors="true" verbose="true"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
4-
convertDeprecationsToExceptions="true"
5-
>
6-
<testsuites>
7-
<testsuite name="Integration">
8-
<directory>./tests/Integration</directory>
9-
</testsuite>
10-
<testsuite name="Performance">
11-
<directory>./tests/Performance</directory>
12-
</testsuite>
13-
<testsuite name="Unit">
14-
<directory>./tests/Unit</directory>
15-
</testsuite>
16-
</testsuites>
17-
<php>
18-
<env name="CONNECTION" value="neo4j://neo4j:testtest@localhost" />
19-
</php>
1+
<?xml version="1.0"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
3+
<testsuites>
4+
<testsuite name="Integration">
5+
<directory>./tests/Integration</directory>
6+
</testsuite>
7+
<testsuite name="Performance">
8+
<directory>./tests/Performance</directory>
9+
</testsuite>
10+
<testsuite name="Unit">
11+
<directory>./tests/Unit</directory>
12+
</testsuite>
13+
</testsuites>
14+
<php>
15+
<env name="CONNECTION" value="neo4j://neo4j:testtest@localhost:11687"/>
16+
</php>
2017
</phpunit>

0 commit comments

Comments
 (0)