Skip to content

Commit

Permalink
Merge pull request #199 from neo4j-php/ISSUE-198
Browse files Browse the repository at this point in the history
ci: Fix pipeline
  • Loading branch information
exaby73 authored Jul 15, 2024
2 parents eb9674d + c3e836b commit 17c7db1
Show file tree
Hide file tree
Showing 70 changed files with 603 additions and 528 deletions.
78 changes: 39 additions & 39 deletions .github/workflows/integration-test-aura.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
name: Integration Tests

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
tests:
runs-on: ubuntu-latest
env:
CONNECTION: ${{ secrets.AURA_PRO }}
name: "Running on all provided Aura instances"

steps:
- uses: actions/checkout@v2
- name: Cache Composer dependencies
uses: actions/cache@v2
with:
path: /tmp/composer-cache
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
- uses: php-actions/composer@v6
with:
progress: yes
php_version: 8.0
version: 2
- name: clean database
run: CONNECTION=$CONNECTION php tests/clean-database.php
- uses: php-actions/phpunit@v3
with:
configuration: phpunit.xml.dist
php_version: 8.0
memory_limit: 1024M
version: 9
testsuite: Integration
bootstrap: vendor/autoload.php
#name: Integration Tests
#
#on:
# push:
# branches:
# - main
# pull_request:
# branches:
# - main
#
#jobs:
# tests:
# runs-on: ubuntu-latest
# env:
# CONNECTION: ${{ secrets.AURA_PRO }}
# name: "Running on all provided Aura instances"
#
# steps:
# - uses: actions/checkout@v2
# - name: Cache Composer dependencies
# uses: actions/cache@v2
# with:
# path: /tmp/composer-cache
# key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
# - uses: php-actions/composer@v6
# with:
# progress: yes
# php_version: 8.1
# version: 2
# - name: clean database
# run: CONNECTION=$CONNECTION php tests/clean-database.php
# - uses: php-actions/phpunit@v3
# with:
# configuration: phpunit.xml.dist
# php_version: 8.1
# memory_limit: 1024M
# version: 10
# testsuite: Integration
# bootstrap: vendor/autoload.php
8 changes: 4 additions & 4 deletions .github/workflows/integration-test-cluster-neo4j-4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
env:
CONNECTION: neo4j://neo4j:testtest@localhost:7688
name: "Running on PHP 8.0 in a Neo4j 4.4 cluster"
name: "Running on PHP 8.1 in a Neo4j 4.4 cluster"

steps:
- uses: actions/checkout@v2
Expand All @@ -25,14 +25,14 @@ jobs:
- uses: php-actions/composer@v6
with:
progress: yes
php_version: 8.0
php_version: 8.1
version: 2
- uses: php-actions/phpunit@v3
with:
configuration: phpunit.xml.dist
php_version: 8.0
php_version: 8.1
memory_limit: 1024M
version: 9
version: 10
testsuite: Integration
bootstrap: vendor/autoload.php

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/integration-test-cluster-neo4j-5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
env:
CONNECTION: neo4j://neo4j:testtest@localhost:7687
name: "Running on PHP 8.0 with a Neo4j 5.10-enterprise cluster"
name: "Running on PHP 8.1 with a Neo4j 5.20-enterprise cluster"

steps:
- uses: actions/checkout@v2
Expand All @@ -25,20 +25,20 @@ jobs:
- uses: php-actions/composer@v6
with:
progress: yes
php_version: 8.0
php_version: 8.1
version: 2
- uses: php-actions/phpunit@v3
with:
configuration: phpunit.xml.dist
php_version: 8.0
php_version: 8.1
memory_limit: 1024M
version: 9
version: 10
testsuite: Integration
bootstrap: vendor/autoload.php

services:
server1:
image: neo4j:5.10-enterprise
image: neo4j:5.20-enterprise
ports:
- 7687:7687
- 7473:7473
Expand All @@ -59,7 +59,7 @@ jobs:
--health-timeout "15s"
--health-retries "5"
server2:
image: neo4j:5.10-enterprise
image: neo4j:5.20-enterprise
ports:
- 8687:7687
- 8473:7473
Expand All @@ -80,7 +80,7 @@ jobs:
--health-timeout "15s"
--health-retries "5"
server3:
image: neo4j:5.10-enterprise
image: neo4j:5.20-enterprise
ports:
- 9474:7474
- 9473:7473
Expand All @@ -101,7 +101,7 @@ jobs:
--health-timeout "15s"
--health-retries "5"
read-server4:
image: neo4j:5.10-enterprise
image: neo4j:5.20-enterprise
ports:
- 10474:7474
- 10473:7473
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
- uses: php-actions/composer@v6
with:
progress: yes
php_version: 8.2
php_version: 8.1
version: 2
- uses: php-actions/phpunit@v3
with:
configuration: phpunit.xml.dist
php_version: 8.2
php_version: 8.1
memory_limit: 1024M
version: 9
version: 10
testsuite: Unit
bootstrap: vendor/autoload.php
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ composer.lock
.env
/docs/_build
cachegrind.out.*
.phpunit.cache/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.0-cli
FROM php:8.1-cli
RUN apt-get update \
&& apt-get install -y \
libzip-dev \
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"psr/http-factory": "^1.0",
"psr/http-client": "^1.0",
"php-http/message": "^1.0",
"stefanak-michal/bolt": "^6.0",
"stefanak-michal/bolt": "^7.0.1",
"symfony/polyfill-php80": "^1.2",
"psr/simple-cache": ">=2.0",
"ext-json": "*",
Expand All @@ -43,7 +43,7 @@
"composer-runtime-api": "Install composer 2 for auto detection of version in user agent"
},
"require-dev": {
"phpunit/phpunit": "^9.0",
"phpunit/phpunit": "^10.0",
"nyholm/psr7": "^1.3",
"nyholm/psr7-server": "^1.0",
"kriswallsmith/buzz": "^1.2",
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:
- .env
neo4j:
<<: *common
image: neo4j:5.10-community
image: neo4j:5.20-community
hostname: neo4j
networks:
- neo4j
Expand Down
35 changes: 16 additions & 19 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
<phpunit colors="true" verbose="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
convertDeprecationsToExceptions="true"
>
<testsuites>
<testsuite name="Integration">
<directory>./tests/Integration</directory>
</testsuite>
<testsuite name="Performance">
<directory>./tests/Performance</directory>
</testsuite>
<testsuite name="Unit">
<directory>./tests/Unit</directory>
</testsuite>
</testsuites>
<php>
<env name="CONNECTION" value="neo4j://neo4j:testtest@localhost" />
</php>
<?xml version="1.0"?>
<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">
<testsuites>
<testsuite name="Integration">
<directory>./tests/Integration</directory>
</testsuite>
<testsuite name="Performance">
<directory>./tests/Performance</directory>
</testsuite>
<testsuite name="Unit">
<directory>./tests/Unit</directory>
</testsuite>
</testsuites>
<php>
<env name="CONNECTION" value="neo4j://neo4j:testtest@localhost:11687"/>
</php>
</phpunit>
Loading

0 comments on commit 17c7db1

Please sign in to comment.