Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,6 @@ component_management:
name: adapter-doctrine
paths:
- src/adapter/etl-adapter-doctrine/**
- component_id: adapter-elasticsearch
name: adapter-elasticsearch
paths:
- src/adapter/etl-adapter-elasticsearch/**
- component_id: adapter-google-sheet
name: adapter-google-sheet
paths:
Expand Down Expand Up @@ -199,6 +195,10 @@ component_management:
name: adapter-postgresql
paths:
- src/adapter/etl-adapter-postgresql/**
- component_id: adapter-seal
name: adapter-seal
paths:
- src/adapter/etl-adapter-seal/**
- component_id: bridge-phpunit-postgresql
name: bridge-phpunit-postgresql
paths:
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/job-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,24 @@ jobs:
MYSQL_DATABASE: mysql
MYSQL_ROOT_PASSWORD: root
elasticsearch:
image: elasticsearch:7.17.28
image: elasticsearch:8.19.0
env:
discovery.type: single-node
xpack.security.enabled: "false"
options: >-
--health-cmd "curl http://localhost:9200/_cluster/health"
--health-interval 10s
--health-timeout 5s
--health-retries 10
ports:
- 9200:9200
- 9200/tcp
meilisearch:
image: getmeili/meilisearch:v1.16
env:
MEILI_MASTER_KEY: masterKey
MEILI_NO_ANALYTICS: "true"
ports:
- 7700/tcp
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -129,6 +137,8 @@ jobs:
env:
PGSQL_DATABASE_URL: pgsql://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports['5432'] }}/postgres?serverVersion=11&charset=utf8
MYSQL_DATABASE_URL: mysql://mysql:mysql@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/mysql
ELASTICSEARCH_URL: http://127.0.0.1:${{ job.services.elasticsearch.ports['9200'] }}
MEILISEARCH_URL: http://127.0.0.1:${{ job.services.meilisearch.ports['7700'] }}
SQLITE_DATABASE_URL: "sqlite:///:memory:"
AZURITE_HOST: "localhost"
AZURITE_BLOB_PORT: "10000"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/monorepo-split.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ jobs:
split_repository: 'etl-adapter-csv'
- local_path: 'src/adapter/etl-adapter-doctrine'
split_repository: 'etl-adapter-doctrine'
- local_path: 'src/adapter/etl-adapter-elasticsearch'
split_repository: 'etl-adapter-elasticsearch'
- local_path: 'src/adapter/etl-adapter-excel'
split_repository: 'etl-adapter-excel'
- local_path: 'src/adapter/etl-adapter-google-sheet'
Expand All @@ -78,6 +76,8 @@ jobs:
split_repository: 'etl-adapter-xml'
- local_path: 'src/adapter/etl-adapter-postgresql'
split_repository: 'etl-adapter-postgresql'
- local_path: 'src/adapter/etl-adapter-seal'
split_repository: 'etl-adapter-seal'

- local_path: 'src/bridge/filesystem/azure'
split_repository: 'filesystem-azure-bridge'
Expand Down
2 changes: 1 addition & 1 deletion bin/docs.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ public function execute(InputInterface $input, OutputInterface $output): int
__DIR__ . '/../src/adapter/etl-adapter-csv/src/Flow/ETL/Adapter/CSV/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/DSL/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-elasticsearch/src/Flow/ETL/Adapter/Elasticsearch/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-google-sheet/src/Flow/ETL/Adapter/GoogleSheet/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-http/src/Flow/ETL/Adapter/Http/DSL/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-json/src/Flow/ETL/Adapter/JSON/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-parquet/src/Flow/ETL/Adapter/Parquet/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-seal/src/Flow/ETL/Adapter/Seal/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-text/src/Flow/ETL/Adapter/Text/functions.php',
__DIR__ . '/../src/adapter/etl-adapter-xml/src/Flow/ETL/Adapter/XML/functions.php',
__DIR__ . '/../src/lib/filesystem/src/Flow/Filesystem/DSL/functions.php',
Expand Down
13 changes: 12 additions & 1 deletion compose.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,28 @@ services:
networks:
- flow-php
elasticsearch:
image: elasticsearch:7.17.2
image: elasticsearch:8.19.0
container_name: flow-php-elasticsearch
ports:
- 9200:9200
environment:
- node.name=es01
- discovery.type=single-node
- xpack.security.enabled=false
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
networks:
- flow-php
meilisearch:
image: getmeili/meilisearch:v1.16
container_name: flow-php-meilisearch
ports:
- "7700:7700"
environment:
- MEILI_MASTER_KEY=masterKey
- MEILI_NO_ANALYTICS=true
networks:
- flow-php
azurite:
image: mcr.microsoft.com/azure-storage/azurite
container_name: flow-php-azurite
Expand Down
14 changes: 9 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"composer-runtime-api": "^2.2",
"async-aws/s3": "^2.6 || ^3.0",
"brick/math": "^0.12 || ^0.13 || ^0.14 || ^0.15 || ^0.16 || ^0.17",
"cmsig/seal": "^0.12",
"coduo/php-humanizer": "^5.0",
"cuyz/valinor": "^2.4",
"doctrine/dbal": "^4.4",
"elasticsearch/elasticsearch": "^7.6|^8.0",
"google/apiclient": "^2.13",
"google/protobuf": "^4.0 || ^5.0",
"halaxa/json-machine": "^1.1",
Expand All @@ -52,7 +52,11 @@
"webmozart/glob": "^3.0 || ^4.0"
},
"require-dev": {
"cmsig/seal-elasticsearch-adapter": "^0.12",
"cmsig/seal-meilisearch-adapter": "^0.12",
"cmsig/seal-memory-adapter": "^0.12",
"composer/semver": "^3.4",
"elasticsearch/elasticsearch": "^8.5.3",
"fakerphp/faker": "^1.23",
"fig/log-test": "^1.1",
"grpc/grpc": "^1.74",
Expand Down Expand Up @@ -83,7 +87,6 @@
"flow-php/etl-adapter-chartjs": "self.version",
"flow-php/etl-adapter-csv": "self.version",
"flow-php/etl-adapter-doctrine": "self.version",
"flow-php/etl-adapter-elasticsearch": "self.version",
"flow-php/etl-adapter-excel": "self.version",
"flow-php/etl-adapter-filesystem": "self.version",
"flow-php/etl-adapter-google-sheet": "self.version",
Expand All @@ -92,6 +95,7 @@
"flow-php/etl-adapter-logger": "self.version",
"flow-php/etl-adapter-parquet": "self.version",
"flow-php/etl-adapter-postgresql": "self.version",
"flow-php/etl-adapter-seal": "self.version",
"flow-php/etl-adapter-text": "self.version",
"flow-php/etl-adapter-xml": "self.version",
"flow-php/filesystem": "self.version",
Expand Down Expand Up @@ -136,14 +140,14 @@
"src/adapter/etl-adapter-chartjs/src/Flow",
"src/adapter/etl-adapter-csv/src/Flow",
"src/adapter/etl-adapter-doctrine/src/Flow",
"src/adapter/etl-adapter-elasticsearch/src/Flow",
"src/adapter/etl-adapter-excel/src/Flow",
"src/adapter/etl-adapter-google-sheet/src/Flow",
"src/adapter/etl-adapter-http/src/Flow",
"src/adapter/etl-adapter-json/src/Flow",
"src/adapter/etl-adapter-logger/src/Flow",
"src/adapter/etl-adapter-parquet/src/Flow",
"src/adapter/etl-adapter-postgresql/src/Flow",
"src/adapter/etl-adapter-seal/src/Flow",
"src/adapter/etl-adapter-text/src/Flow",
"src/adapter/etl-adapter-xml/src/Flow",
"src/bridge/filesystem/async-aws/src/Flow",
Expand Down Expand Up @@ -202,13 +206,13 @@
"src/adapter/etl-adapter-chartjs/src/Flow/ETL/Adapter/ChartJS/functions.php",
"src/adapter/etl-adapter-csv/src/Flow/ETL/Adapter/CSV/functions.php",
"src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/functions.php",
"src/adapter/etl-adapter-elasticsearch/src/Flow/ETL/Adapter/Elasticsearch/functions.php",
"src/adapter/etl-adapter-excel/src/Flow/ETL/Adapter/Excel/DSL/functions.php",
"src/adapter/etl-adapter-google-sheet/src/Flow/ETL/Adapter/GoogleSheet/functions.php",
"src/adapter/etl-adapter-http/src/Flow/ETL/Adapter/Http/DSL/functions.php",
"src/adapter/etl-adapter-json/src/Flow/ETL/Adapter/JSON/functions.php",
"src/adapter/etl-adapter-parquet/src/Flow/ETL/Adapter/Parquet/functions.php",
"src/adapter/etl-adapter-postgresql/src/Flow/ETL/Adapter/PostgreSql/functions.php",
"src/adapter/etl-adapter-seal/src/Flow/ETL/Adapter/Seal/functions.php",
"src/adapter/etl-adapter-text/src/Flow/ETL/Adapter/Text/functions.php",
"src/adapter/etl-adapter-xml/src/Flow/ETL/Adapter/XML/functions.php",
"src/bridge/filesystem/async-aws/src/Flow/Filesystem/Bridge/AsyncAWS/DSL/functions.php",
Expand Down Expand Up @@ -254,14 +258,14 @@
"src/adapter/etl-adapter-chartjs/tests/Flow",
"src/adapter/etl-adapter-csv/tests/Flow",
"src/adapter/etl-adapter-doctrine/tests/Flow",
"src/adapter/etl-adapter-elasticsearch/tests/Flow",
"src/adapter/etl-adapter-excel/tests/Flow",
"src/adapter/etl-adapter-google-sheet/tests/Flow",
"src/adapter/etl-adapter-http/tests/Flow",
"src/adapter/etl-adapter-json/tests/Flow",
"src/adapter/etl-adapter-logger/tests/Flow",
"src/adapter/etl-adapter-parquet/tests/Flow",
"src/adapter/etl-adapter-postgresql/tests/Flow",
"src/adapter/etl-adapter-seal/tests/Flow",
"src/adapter/etl-adapter-text/tests/Flow",
"src/adapter/etl-adapter-xml/tests/Flow",
"src/bridge/filesystem/async-aws/tests/Flow",
Expand Down
Loading
Loading