From 942d5e6a7a422a9d468694f405724c34b725747d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 10:53:31 +0100 Subject: [PATCH 01/12] ci: Fix benchmark artifact name --- .github/workflows/benchmark.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 93504b116..00eeb65df 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -50,7 +50,7 @@ jobs: - uses: actions/upload-artifact@v3 name: Upload the Benchmark results with: - name: bench-main-result + name: bench-branch-main-result path: dist/bench-branch-main-result.xml pr-bench-test: From fd47cb64f24f639ab0457bd0d8c18f4240e34227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 11:01:53 +0100 Subject: [PATCH 02/12] retry --- .github/workflows/benchmark.yaml | 2 +- phpbench.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 00eeb65df..505b43db6 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -51,7 +51,7 @@ jobs: name: Upload the Benchmark results with: name: bench-branch-main-result - path: dist/bench-branch-main-result.xml + path: dist/.phpbench pr-bench-test: runs-on: ubuntu-latest diff --git a/phpbench.json b/phpbench.json index 1eb7f89db..b778952e1 100644 --- a/phpbench.json +++ b/phpbench.json @@ -1,5 +1,6 @@ { "$schema":"vendor-bin/phpbench/vendor/phpbench/phpbench/phpbench.schema.json", "runner.bootstrap": "vendor/autoload.php", - "runner.file_pattern": "*Bench.php" + "runner.file_pattern": "*Bench.php", + "xml_storage_path": "dist/.phpbench" } From aaa781fddd9cc1568d22b44cd686630b0fa4eb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 11:02:35 +0100 Subject: [PATCH 03/12] add debug statement --- .github/workflows/benchmark.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 505b43db6..0699ce785 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -124,6 +124,9 @@ jobs: with: name: bench-branch-main-result + - name: Check history + run: vendor-bin/phpbench/vendor/bin/phpbench log + - name: Run PHPBench for PR branch run: make phpbench_pr From 3b223598d32392952aa9851cf267e149c25654ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 11:07:40 +0100 Subject: [PATCH 04/12] fix config --- phpbench.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpbench.json b/phpbench.json index b778952e1..416ead2e8 100644 --- a/phpbench.json +++ b/phpbench.json @@ -2,5 +2,5 @@ "$schema":"vendor-bin/phpbench/vendor/phpbench/phpbench/phpbench.schema.json", "runner.bootstrap": "vendor/autoload.php", "runner.file_pattern": "*Bench.php", - "xml_storage_path": "dist/.phpbench" + "storage.xml_storage_path": "dist/.phpbench" } From 21ff5cf8426e6fff86cc83ee920986e3b51476b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 20:09:38 +0100 Subject: [PATCH 05/12] upload directory --- .github/workflows/benchmark.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 0699ce785..5f73843ae 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -51,7 +51,7 @@ jobs: name: Upload the Benchmark results with: name: bench-branch-main-result - path: dist/.phpbench + path: dist/.phpbench/ pr-bench-test: runs-on: ubuntu-latest From fe76d498f6eb484da635a89acdf887976631cca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 20:14:07 +0100 Subject: [PATCH 06/12] debugt --- .github/workflows/benchmark.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 5f73843ae..5d7c75a44 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -47,6 +47,9 @@ jobs: - name: Run PHPBench run: make phpbench_main + - name: Debug + run: tree dist + - uses: actions/upload-artifact@v3 name: Upload the Benchmark results with: From 8c63fc60699e0e36acabc9e48e62e60f7376b013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 20:19:39 +0100 Subject: [PATCH 07/12] fix directory --- .github/workflows/benchmark.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 5d7c75a44..62c8a1dcf 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -47,14 +47,13 @@ jobs: - name: Run PHPBench run: make phpbench_main - - name: Debug - run: tree dist - - uses: actions/upload-artifact@v3 name: Upload the Benchmark results with: name: bench-branch-main-result - path: dist/.phpbench/ + path: | + dist/.phpbench/ + dist/bench/ pr-bench-test: runs-on: ubuntu-latest From 8b441b9ed48b66a9c35220a89ed8a6212eda5a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 20:24:37 +0100 Subject: [PATCH 08/12] change path --- .github/workflows/benchmark.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 62c8a1dcf..36718c651 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -51,9 +51,7 @@ jobs: name: Upload the Benchmark results with: name: bench-branch-main-result - path: | - dist/.phpbench/ - dist/bench/ + path: dist/bench/ pr-bench-test: runs-on: ubuntu-latest From f51fc5012ea77fcc0ffac1ed64c0742f0fd8b522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sat, 25 Nov 2023 20:24:51 +0100 Subject: [PATCH 09/12] change path --- phpbench.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpbench.json b/phpbench.json index 416ead2e8..1c4b63ff9 100644 --- a/phpbench.json +++ b/phpbench.json @@ -2,5 +2,5 @@ "$schema":"vendor-bin/phpbench/vendor/phpbench/phpbench/phpbench.schema.json", "runner.bootstrap": "vendor/autoload.php", "runner.file_pattern": "*Bench.php", - "storage.xml_storage_path": "dist/.phpbench" + "storage.xml_storage_path": "dist/bench" } From 3206e3fb2d464e13c9626f1a14295e8046ca2dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sun, 26 Nov 2023 09:25:38 +0100 Subject: [PATCH 10/12] copy dist --- .github/workflows/benchmark.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 36718c651..84d7e742b 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -51,7 +51,7 @@ jobs: name: Upload the Benchmark results with: name: bench-branch-main-result - path: dist/bench/ + path: dist/ pr-bench-test: runs-on: ubuntu-latest From 8a0faaa0ea813efe5b8deff1db3c2a53b1c304e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sun, 26 Nov 2023 09:32:11 +0100 Subject: [PATCH 11/12] debug --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 733138718..e76c683f4 100644 --- a/Makefile +++ b/Makefile @@ -271,7 +271,7 @@ phpbench_pr: $(PHPBENCH_BIN) $(PHPBENCH_WITH_COMPACTORS_VENDOR_DIR) $(PHPBENCH_W .PHONY: phpbench_main phpbench_main: $(PHPBENCH_BIN) $(PHPBENCH_WITH_COMPACTORS_VENDOR_DIR) $(PHPBENCH_WITHOUT_COMPACTORS_VENDOR_DIR) - $(PHPBENCH) run tests/Benchmark --report=benchmark --tag=main + $(PHPBENCH) run tests/Benchmark --report=benchmark --tag=main -vvv #--------------------------------------------------------------------------- From 55b47e5cd15a141827bdf4336970ea771264050b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= Date: Sun, 26 Nov 2023 09:38:24 +0100 Subject: [PATCH 12/12] add XML --- .github/workflows/benchmark.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index 84d7e742b..333c0041c 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -26,6 +26,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '8.2' + extensions: xml ini-values: phar.readonly=0, display_errors=On, error_reporting=-1 tools: composer coverage: none @@ -66,6 +67,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '8.2' + extensions: xml ini-values: phar.readonly=0, display_errors=On, error_reporting=-1 tools: composer coverage: none @@ -101,6 +103,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '8.2' + extensions: xml ini-values: phar.readonly=0, display_errors=On, error_reporting=-1 tools: composer coverage: none