From b538d6d24619c185007f39231da7d8ee2dcd692f Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Tue, 22 Oct 2024 11:22:14 +0200 Subject: [PATCH 1/2] Fix documentation generation (#2230) * Update download link for phpDocumentor.phar * Remove template to use default template for phpdocs * Adjust path to src --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9d3e51d76..8fac653d0 100644 --- a/Makefile +++ b/Makefile @@ -59,12 +59,12 @@ run-coveralls: tools/php-coveralls.phar -v tools/phpdocumentor.phar: - curl https://gitreleases.dev/gh/phpDocumentor/phpDocumentor/latest/phpDocumentor.phar -o tools/phpdocumentor.phar --silent -L; \ + curl http://www.phpdoc.org/phpDocumentor.phar -o tools/phpdocumentor.phar --silent -L; \ chmod +x tools/phpdocumentor.phar .PHONY: run-phpdoc run-phpdoc: tools/phpdocumentor.phar - tools/phpdocumentor.phar --directory=lib --target=build/docs --template=clean + tools/phpdocumentor.phar --directory=src --target=build/docs ## ## Docker commands From 5e3740b65dcd9d5164052ea6264c58b9e486387c Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Wed, 23 Oct 2024 10:52:16 +0200 Subject: [PATCH 2/2] use compose of docker --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index a2137aa09..da654a374 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -74,7 +74,7 @@ jobs: sudo sysctl -w vm.swappiness=1 sudo sysctl -w fs.file-max=262144 sudo sysctl -w vm.max_map_count=262144 - ES_VERSION=${{ matrix.elasticsearch }} docker-compose --file=docker/docker-compose.proxy.yml --file=docker/docker-compose.es.yml up --detach + ES_VERSION=${{ matrix.elasticsearch }} docker compose --file=docker/docker-compose.proxy.yml --file=docker/docker-compose.es.yml up --detach docker run --rm --network=docker_elastic curlimages/curl --max-time 120 --retry-max-time 120 --retry 120 --retry-delay 5 --retry-all-errors --show-error --silent http://es01:9200 docker run --rm --network=docker_elastic curlimages/curl --max-time 120 --retry-max-time 120 --retry 120 --retry-delay 5 --retry-all-errors --show-error --silent http://es02:9200