From 570cb46d702ead7f0616b61b6a26e15578708517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 22:32:06 +0200 Subject: [PATCH 01/12] Skip un-needed ini debug --- install-extensions.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/install-extensions.sh b/install-extensions.sh index 9094699..dbef674 100755 --- a/install-extensions.sh +++ b/install-extensions.sh @@ -58,9 +58,6 @@ install_tideways_xhprof() { has_extension "$extension" } -# Show php config paths -php --ini - case "$(uname -s):$PHP_VERSION" in *:5.*) install_xhprof 0.9.4 From 7f34349f0dcf0c7f4b41e0ef7fcb3a8d911941fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 22:49:20 +0200 Subject: [PATCH 02/12] Print pecl version info --- install-extensions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install-extensions.sh b/install-extensions.sh index dbef674..1a64ee2 100755 --- a/install-extensions.sh +++ b/install-extensions.sh @@ -58,6 +58,8 @@ install_tideways_xhprof() { has_extension "$extension" } +pecl version + case "$(uname -s):$PHP_VERSION" in *:5.*) install_xhprof 0.9.4 From 2694c508c98f8bb225265f7ae27a83e763a35918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 23:10:46 +0200 Subject: [PATCH 03/12] Print enabled extensions --- install-extensions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-extensions.sh b/install-extensions.sh index 1a64ee2..c31f982 100755 --- a/install-extensions.sh +++ b/install-extensions.sh @@ -59,6 +59,7 @@ install_tideways_xhprof() { } pecl version +php -m case "$(uname -s):$PHP_VERSION" in *:5.*) From e386551e7658fa88db55080b9df2dcace5ade8e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 22:05:39 +0200 Subject: [PATCH 04/12] Add php 5.x to test matrix --- .github/workflows/tests-mongodb.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/tests-mongodb.yml b/.github/workflows/tests-mongodb.yml index d8df373..ef02fc1 100644 --- a/.github/workflows/tests-mongodb.yml +++ b/.github/workflows/tests-mongodb.yml @@ -18,6 +18,14 @@ jobs: - "7.3" - "7.4" include: + - php: "5.3" + phpunit: "4" + - php: "5.4" + phpunit: "4" + - php: "5.5" + phpunit: "4" + - php: "5.6" + phpunit: "4" - php: "7.0" phpunit: "6" From 3c0132e52fda18fc4b5ce806dac5b7cfa76ae7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 23:15:21 +0200 Subject: [PATCH 05/12] Add mongo to installed ext list --- .github/workflows/tests-mongodb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-mongodb.yml b/.github/workflows/tests-mongodb.yml index ef02fc1..ed0bc39 100644 --- a/.github/workflows/tests-mongodb.yml +++ b/.github/workflows/tests-mongodb.yml @@ -47,7 +47,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: xdebug, xhprof, mongodb, tideways_xhprof + extensions: xdebug, xhprof, mongo, mongodb, tideways_xhprof - name: Validate composer.json and composer.lock run: composer validate From 6fa1f7ccbb042b39948d9c4efdfc8ca548d3faac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 22:30:51 +0200 Subject: [PATCH 06/12] Remove un-needed --no-progress --- .github/workflows/tests-mongodb.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-mongodb.yml b/.github/workflows/tests-mongodb.yml index ed0bc39..88574e7 100644 --- a/.github/workflows/tests-mongodb.yml +++ b/.github/workflows/tests-mongodb.yml @@ -54,7 +54,7 @@ jobs: - name: Install dependencies run: | - composer install --prefer-dist --no-progress + composer install --prefer-dist composer require --dev phpunit/phpunit:^$PHPUNIT_VERSION - name: Install extensions From 8a4d2aa8c18b20cd139fd39ba7f334dcfd778057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 22:40:32 +0200 Subject: [PATCH 07/12] Remove alcaeus/mongo-php-adapter for php 5.x --- .github/workflows/tests-mongodb.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests-mongodb.yml b/.github/workflows/tests-mongodb.yml index 88574e7..fa44adf 100644 --- a/.github/workflows/tests-mongodb.yml +++ b/.github/workflows/tests-mongodb.yml @@ -54,6 +54,7 @@ jobs: - name: Install dependencies run: | + composer remove alcaeus/mongo-php-adapter --no-update --dev composer install --prefer-dist composer require --dev phpunit/phpunit:^$PHPUNIT_VERSION From 262b07c6e30b36d11f40e4f26a135f07ad5b0c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 23:17:49 +0200 Subject: [PATCH 08/12] Use ext variable --- install-extensions.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/install-extensions.sh b/install-extensions.sh index c31f982..a600965 100755 --- a/install-extensions.sh +++ b/install-extensions.sh @@ -17,14 +17,16 @@ has_extension() { } install_xhprof() { - local version="${1:-stable}" + local ext="xhprof" version="${1:-stable}" - has_extension "xhprof" && return 0 - pecl install xhprof-$version + has_extension "$ext" && return 0 + pecl install "$ext-$version" } install_mongo() { - echo no | pecl install mongo + local ext="mongo" version="${1:-stable}" + + echo no | pecl install "$ext-$version" } install_mongodb() { From a2c8c19d3dcafad1580fb8de11e03a6145a30047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 23:14:30 +0200 Subject: [PATCH 09/12] Skip mongo install if already present --- install-extensions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-extensions.sh b/install-extensions.sh index a600965..030ada1 100755 --- a/install-extensions.sh +++ b/install-extensions.sh @@ -26,6 +26,7 @@ install_xhprof() { install_mongo() { local ext="mongo" version="${1:-stable}" + has_extension "$ext" && return 0 echo no | pecl install "$ext-$version" } From bc16bb17c422d008258f94456313a46ed3e711b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 23:07:34 +0200 Subject: [PATCH 10/12] Force mongo version to 1.6.16 --- install-extensions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-extensions.sh b/install-extensions.sh index 030ada1..5c5de25 100755 --- a/install-extensions.sh +++ b/install-extensions.sh @@ -67,7 +67,7 @@ php -m case "$(uname -s):$PHP_VERSION" in *:5.*) install_xhprof 0.9.4 - install_mongo + install_mongo 1.6.16 ;; Linux:7.*|Linux:8.*) install_xhprof From 19d2648c166dda2a88bf10167820627beee8fd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 23:06:31 +0200 Subject: [PATCH 11/12] Fix: Override owner for pear install dir Workaround for setup-php leaving trash around --- install-extensions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install-extensions.sh b/install-extensions.sh index 5c5de25..5f583bd 100755 --- a/install-extensions.sh +++ b/install-extensions.sh @@ -20,6 +20,8 @@ install_xhprof() { local ext="xhprof" version="${1:-stable}" has_extension "$ext" && return 0 + # https://github.com/shivammathur/setup-php/issues/905 + sudo rm -rf /tmp/pear # shivammathur's leftovers... pecl install "$ext-$version" } From 6f5ecc931c16dcb29c5c1c6ac4e39e8f4181ba62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 20 Jan 2025 23:06:31 +0200 Subject: [PATCH 12/12] Fix owner for php install dir --- install-extensions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install-extensions.sh b/install-extensions.sh index 5f583bd..951182e 100755 --- a/install-extensions.sh +++ b/install-extensions.sh @@ -22,6 +22,8 @@ install_xhprof() { has_extension "$ext" && return 0 # https://github.com/shivammathur/setup-php/issues/905 sudo rm -rf /tmp/pear # shivammathur's leftovers... + # Allow installing to /usr/local/php + sudo chown -R "$(id -un):" /usr/local/php/ pecl install "$ext-$version" }