From 5a8ceb9919e53a8092619c1dfa3388953ef15459 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Fri, 27 Oct 2023 12:19:15 +0200 Subject: [PATCH 1/8] Drop spawned web server in Composer repository tests Since Composer 2.6, relative local paths are possible for repositories of type composer: https://github.com/composer/composer/pull/11526 --- .github/workflows/ci.yml | 2 +- .../platform/repository/futurepaks/composer.json | 2 +- .../repository/priorities/composer-canonical.json | 4 ++-- .../repository/priorities/composer-default.json | 4 ++-- .../repository/priorities/composer-exclude.json | 4 ++-- .../repository/priorities/composer-only.json | 4 ++-- test/spec/platform_spec.rb | 12 ------------ 7 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47b4db734b..425c7e55e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: "8.1" - tools: "composer:2.4" + tools: "composer:2.6" - name: Hatchet setup run: bundle exec hatchet ci:setup - name: Export HEROKU_PHP_PLATFORM_REPOSITORIES to …-develop (since we are not building main or a tag) diff --git a/test/fixtures/platform/repository/futurepaks/composer.json b/test/fixtures/platform/repository/futurepaks/composer.json index 48af0595fd..334f5a7735 100644 --- a/test/fixtures/platform/repository/futurepaks/composer.json +++ b/test/fixtures/platform/repository/futurepaks/composer.json @@ -34,7 +34,7 @@ }, { "type": "composer", - "url": "http://localhost:8080/packages.json" + "url": "./packages.json" }, { "type": "package", diff --git a/test/fixtures/platform/repository/priorities/composer-canonical.json b/test/fixtures/platform/repository/priorities/composer-canonical.json index a7f3a5feda..4e688bd548 100644 --- a/test/fixtures/platform/repository/priorities/composer-canonical.json +++ b/test/fixtures/platform/repository/priorities/composer-canonical.json @@ -30,12 +30,12 @@ }, { "type": "composer", - "url": "http://localhost:8080/packages-custom.json", + "url": "./packages-custom.json", "canonical": false }, { "type": "composer", - "url": "http://localhost:8080/packages.json" + "url": "./packages.json" }, { "type": "package", diff --git a/test/fixtures/platform/repository/priorities/composer-default.json b/test/fixtures/platform/repository/priorities/composer-default.json index 2dc4dd2a8e..cec3b466eb 100644 --- a/test/fixtures/platform/repository/priorities/composer-default.json +++ b/test/fixtures/platform/repository/priorities/composer-default.json @@ -30,11 +30,11 @@ }, { "type": "composer", - "url": "http://localhost:8080/packages-custom.json" + "url": "./packages-custom.json" }, { "type": "composer", - "url": "http://localhost:8080/packages.json" + "url": "./packages.json" }, { "type": "package", diff --git a/test/fixtures/platform/repository/priorities/composer-exclude.json b/test/fixtures/platform/repository/priorities/composer-exclude.json index 6cfa541afe..566611e0da 100644 --- a/test/fixtures/platform/repository/priorities/composer-exclude.json +++ b/test/fixtures/platform/repository/priorities/composer-exclude.json @@ -30,12 +30,12 @@ }, { "type": "composer", - "url": "http://localhost:8080/packages-custom.json", + "url": "./packages-custom.json", "exclude": ["heroku-sys/ext-redis"] }, { "type": "composer", - "url": "http://localhost:8080/packages.json" + "url": "./packages.json" }, { "type": "package", diff --git a/test/fixtures/platform/repository/priorities/composer-only.json b/test/fixtures/platform/repository/priorities/composer-only.json index 31ae41b7d7..c4bc681a1a 100644 --- a/test/fixtures/platform/repository/priorities/composer-only.json +++ b/test/fixtures/platform/repository/priorities/composer-only.json @@ -30,12 +30,12 @@ }, { "type": "composer", - "url": "http://localhost:8080/packages-custom.json", + "url": "./packages-custom.json", "only": ["heroku-sys/ext-igbinary"] }, { "type": "composer", - "url": "http://localhost:8080/packages.json" + "url": "./packages.json" }, { "type": "package", diff --git a/test/spec/platform_spec.rb b/test/spec/platform_spec.rb index 42daeaf029..c7f278f33e 100644 --- a/test/spec/platform_spec.rb +++ b/test/spec/platform_spec.rb @@ -142,17 +142,8 @@ end describe "Repository" do - after(:each) do - Process.kill("TERM", @pid) - Process.wait(@pid) - end - it "can hold packages compatible with future versions of the buildpack the current version will ignore" do Dir.chdir("test/fixtures/platform/repository/futurepaks") do |cwd| - # we spawn a web server that serves packages.json, like a real composer repository - # this is to ensure that Composer really uses ComposerRepository behavior for provide/replace declarations - @pid = spawn("php -S localhost:8080") - cmd = "composer install --dry-run" stdout, stderr, status = Open3.capture3("bash -c #{Shellwords.escape(cmd)}") expect(status.exitstatus).to eq(0), "dry run install failed, stderr: #{stderr}, stdout: #{stdout}" @@ -164,9 +155,6 @@ it "combined with a custom repository installs packages from that repo according to the priority given" do Dir.chdir("test/fixtures/platform/repository/priorities") do |cwd| - # we spawn a web server that serves packages*.json, like a real composer repository - # this is to ensure that Composer really uses ComposerRepository behavior for priorities etc - @pid = spawn("php -S localhost:8080") Dir.glob("composer-*.json") do |testcase| cmd = "COMPOSER=#{testcase} composer install --dry-run" stdout, stderr, status = Open3.capture3("bash -c #{Shellwords.escape(cmd)}") From ed93dcec08b8c9dfd3cb39c11fa646524f7b6430 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 23 Nov 2023 17:03:45 +0100 Subject: [PATCH 2/8] PHP/8.1.26 GUS-W-14451258 --- CHANGELOG.md | 4 ++++ bin/compile | 2 +- support/build/{php-8.1.25 => php-8.1.26} | 0 support/build/{php-min-8.1.25 => php-min-8.1.26} | 0 4 files changed, 5 insertions(+), 1 deletion(-) rename support/build/{php-8.1.25 => php-8.1.26} (100%) rename support/build/{php-min-8.1.25 => php-min-8.1.26} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54572a2e93..83ed463378 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # heroku-buildpack-php CHANGELOG +## v241 (2023-11-??) + +- PHP/8.1.26 [David Zuelke] + ## v240 (2023-10-27) ### ADD diff --git a/bin/compile b/bin/compile index c2f383bedf..6215bb4ac2 100755 --- a/bin/compile +++ b/bin/compile @@ -245,7 +245,7 @@ fi mkdir -p $build_dir/.heroku/php-min ln -s $build_dir/.heroku/php-min /app/.heroku/php-min -curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.1.25.tar.gz" || { +curl_retry_on_18 --retry-connrefused --retry 3 --connect-timeout 5 --fail --silent --location -o $build_dir/.heroku/php-min.tar.gz "${s3_url}php-min-8.1.26.tar.gz" || { mcount "failures.bootstrap.download.php-min" error <<-EOF Failed to download minimal PHP for bootstrapping! diff --git a/support/build/php-8.1.25 b/support/build/php-8.1.26 similarity index 100% rename from support/build/php-8.1.25 rename to support/build/php-8.1.26 diff --git a/support/build/php-min-8.1.25 b/support/build/php-min-8.1.26 similarity index 100% rename from support/build/php-min-8.1.25 rename to support/build/php-min-8.1.26 From 11cfbb496a46677131a4d70fb4f1b26f9c9789f9 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 23 Nov 2023 17:04:20 +0100 Subject: [PATCH 3/8] PHP/8.2.13 GUS-W-14451258 --- CHANGELOG.md | 1 + support/build/{php-8.2.12 => php-8.2.13} | 0 2 files changed, 1 insertion(+) rename support/build/{php-8.2.12 => php-8.2.13} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83ed463378..5ae90c3414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## v241 (2023-11-??) - PHP/8.1.26 [David Zuelke] +- PHP/8.2.13 [David Zuelke] ## v240 (2023-10-27) diff --git a/support/build/php-8.2.12 b/support/build/php-8.2.13 similarity index 100% rename from support/build/php-8.2.12 rename to support/build/php-8.2.13 From 8bbc65f34e386ae292efc05bfea795cf33c62bd6 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 23 Nov 2023 17:08:09 +0100 Subject: [PATCH 4/8] ext-apcu/5.1.23 GUS-W-14451259 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20180731/{apcu-5.1.21 => apcu-5.1.23} | 0 .../no-debug-non-zts-20190902/{apcu-5.1.21 => apcu-5.1.23} | 0 .../no-debug-non-zts-20200930/{apcu-5.1.21 => apcu-5.1.23} | 0 .../no-debug-non-zts-20210902/{apcu-5.1.21 => apcu-5.1.23} | 0 .../no-debug-non-zts-20220829/{apcu-5.1.21 => apcu-5.1.23} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20180731/{apcu-5.1.21 => apcu-5.1.23} (100%) rename support/build/extensions/no-debug-non-zts-20190902/{apcu-5.1.21 => apcu-5.1.23} (100%) rename support/build/extensions/no-debug-non-zts-20200930/{apcu-5.1.21 => apcu-5.1.23} (100%) rename support/build/extensions/no-debug-non-zts-20210902/{apcu-5.1.21 => apcu-5.1.23} (100%) rename support/build/extensions/no-debug-non-zts-20220829/{apcu-5.1.21 => apcu-5.1.23} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ae90c3414..62d010c83c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - PHP/8.1.26 [David Zuelke] - PHP/8.2.13 [David Zuelke] +- ext-apcu/5.1.23 [David Zuelke] ## v240 (2023-10-27) diff --git a/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.21 b/support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.23 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.21 rename to support/build/extensions/no-debug-non-zts-20180731/apcu-5.1.23 diff --git a/support/build/extensions/no-debug-non-zts-20190902/apcu-5.1.21 b/support/build/extensions/no-debug-non-zts-20190902/apcu-5.1.23 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/apcu-5.1.21 rename to support/build/extensions/no-debug-non-zts-20190902/apcu-5.1.23 diff --git a/support/build/extensions/no-debug-non-zts-20200930/apcu-5.1.21 b/support/build/extensions/no-debug-non-zts-20200930/apcu-5.1.23 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/apcu-5.1.21 rename to support/build/extensions/no-debug-non-zts-20200930/apcu-5.1.23 diff --git a/support/build/extensions/no-debug-non-zts-20210902/apcu-5.1.21 b/support/build/extensions/no-debug-non-zts-20210902/apcu-5.1.23 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/apcu-5.1.21 rename to support/build/extensions/no-debug-non-zts-20210902/apcu-5.1.23 diff --git a/support/build/extensions/no-debug-non-zts-20220829/apcu-5.1.21 b/support/build/extensions/no-debug-non-zts-20220829/apcu-5.1.23 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/apcu-5.1.21 rename to support/build/extensions/no-debug-non-zts-20220829/apcu-5.1.23 From fc5a3866cbaf7bcbd7cf6b647e0b23e4ffbc16ca Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 23 Nov 2023 17:09:34 +0100 Subject: [PATCH 5/8] ext-mongodb/1.17.0 GUS-W-14451259 --- CHANGELOG.md | 1 + .../no-debug-non-zts-20190902/{mongodb-1.16.2 => mongodb-1.17.0} | 0 .../no-debug-non-zts-20200930/{mongodb-1.16.2 => mongodb-1.17.0} | 0 .../no-debug-non-zts-20210902/{mongodb-1.16.2 => mongodb-1.17.0} | 0 .../no-debug-non-zts-20220829/{mongodb-1.16.2 => mongodb-1.17.0} | 0 5 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20190902/{mongodb-1.16.2 => mongodb-1.17.0} (100%) rename support/build/extensions/no-debug-non-zts-20200930/{mongodb-1.16.2 => mongodb-1.17.0} (100%) rename support/build/extensions/no-debug-non-zts-20210902/{mongodb-1.16.2 => mongodb-1.17.0} (100%) rename support/build/extensions/no-debug-non-zts-20220829/{mongodb-1.16.2 => mongodb-1.17.0} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62d010c83c..ba245fed0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - PHP/8.1.26 [David Zuelke] - PHP/8.2.13 [David Zuelke] - ext-apcu/5.1.23 [David Zuelke] +- ext-mongodb/1.17.0 [David Zuelke] ## v240 (2023-10-27) diff --git a/support/build/extensions/no-debug-non-zts-20190902/mongodb-1.16.2 b/support/build/extensions/no-debug-non-zts-20190902/mongodb-1.17.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/mongodb-1.16.2 rename to support/build/extensions/no-debug-non-zts-20190902/mongodb-1.17.0 diff --git a/support/build/extensions/no-debug-non-zts-20200930/mongodb-1.16.2 b/support/build/extensions/no-debug-non-zts-20200930/mongodb-1.17.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/mongodb-1.16.2 rename to support/build/extensions/no-debug-non-zts-20200930/mongodb-1.17.0 diff --git a/support/build/extensions/no-debug-non-zts-20210902/mongodb-1.16.2 b/support/build/extensions/no-debug-non-zts-20210902/mongodb-1.17.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/mongodb-1.16.2 rename to support/build/extensions/no-debug-non-zts-20210902/mongodb-1.17.0 diff --git a/support/build/extensions/no-debug-non-zts-20220829/mongodb-1.16.2 b/support/build/extensions/no-debug-non-zts-20220829/mongodb-1.17.0 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/mongodb-1.16.2 rename to support/build/extensions/no-debug-non-zts-20220829/mongodb-1.17.0 From a4edeedacbc05f804fa9d17d2afc2943a7c32ac3 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 23 Nov 2023 17:10:45 +0100 Subject: [PATCH 6/8] ext-newrelic/10.14.0.3 GUS-W-14451259 --- CHANGELOG.md | 1 + .../{newrelic-10.13.0.2 => newrelic-10.14.0.3} | 0 .../{newrelic-10.13.0.2 => newrelic-10.14.0.3} | 0 .../{newrelic-10.13.0.2 => newrelic-10.14.0.3} | 0 .../{newrelic-10.13.0.2 => newrelic-10.14.0.3} | 0 .../{newrelic-10.13.0.2 => newrelic-10.14.0.3} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20180731/{newrelic-10.13.0.2 => newrelic-10.14.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20190902/{newrelic-10.13.0.2 => newrelic-10.14.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20200930/{newrelic-10.13.0.2 => newrelic-10.14.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20210902/{newrelic-10.13.0.2 => newrelic-10.14.0.3} (100%) rename support/build/extensions/no-debug-non-zts-20220829/{newrelic-10.13.0.2 => newrelic-10.14.0.3} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba245fed0d..a1c79f367c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - PHP/8.2.13 [David Zuelke] - ext-apcu/5.1.23 [David Zuelke] - ext-mongodb/1.17.0 [David Zuelke] +- ext-newrelic/10.14.0.3 [David Zuelke] ## v240 (2023-10-27) diff --git a/support/build/extensions/no-debug-non-zts-20180731/newrelic-10.13.0.2 b/support/build/extensions/no-debug-non-zts-20180731/newrelic-10.14.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/newrelic-10.13.0.2 rename to support/build/extensions/no-debug-non-zts-20180731/newrelic-10.14.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20190902/newrelic-10.13.0.2 b/support/build/extensions/no-debug-non-zts-20190902/newrelic-10.14.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/newrelic-10.13.0.2 rename to support/build/extensions/no-debug-non-zts-20190902/newrelic-10.14.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20200930/newrelic-10.13.0.2 b/support/build/extensions/no-debug-non-zts-20200930/newrelic-10.14.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/newrelic-10.13.0.2 rename to support/build/extensions/no-debug-non-zts-20200930/newrelic-10.14.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20210902/newrelic-10.13.0.2 b/support/build/extensions/no-debug-non-zts-20210902/newrelic-10.14.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/newrelic-10.13.0.2 rename to support/build/extensions/no-debug-non-zts-20210902/newrelic-10.14.0.3 diff --git a/support/build/extensions/no-debug-non-zts-20220829/newrelic-10.13.0.2 b/support/build/extensions/no-debug-non-zts-20220829/newrelic-10.14.0.3 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/newrelic-10.13.0.2 rename to support/build/extensions/no-debug-non-zts-20220829/newrelic-10.14.0.3 From 89eebc48a0ffec68969c4bd7668954bdc9832302 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Tue, 28 Nov 2023 22:11:57 +0100 Subject: [PATCH 7/8] ext-blackfire/1.92.1 GUS-W-14451259 --- CHANGELOG.md | 1 + .../{blackfire-1.90.0 => blackfire-1.92.1} | 0 .../{blackfire-1.90.0 => blackfire-1.92.1} | 0 .../{blackfire-1.90.0 => blackfire-1.92.1} | 0 .../{blackfire-1.90.0 => blackfire-1.92.1} | 0 .../{blackfire-1.90.0 => blackfire-1.92.1} | 0 6 files changed, 1 insertion(+) rename support/build/extensions/no-debug-non-zts-20180731/{blackfire-1.90.0 => blackfire-1.92.1} (100%) rename support/build/extensions/no-debug-non-zts-20190902/{blackfire-1.90.0 => blackfire-1.92.1} (100%) rename support/build/extensions/no-debug-non-zts-20200930/{blackfire-1.90.0 => blackfire-1.92.1} (100%) rename support/build/extensions/no-debug-non-zts-20210902/{blackfire-1.90.0 => blackfire-1.92.1} (100%) rename support/build/extensions/no-debug-non-zts-20220829/{blackfire-1.90.0 => blackfire-1.92.1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1c79f367c..49bf242346 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - ext-apcu/5.1.23 [David Zuelke] - ext-mongodb/1.17.0 [David Zuelke] - ext-newrelic/10.14.0.3 [David Zuelke] +- ext-blackfire/1.92.1 [David Zuelke] ## v240 (2023-10-27) diff --git a/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.90.0 b/support/build/extensions/no-debug-non-zts-20180731/blackfire-1.92.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20180731/blackfire-1.90.0 rename to support/build/extensions/no-debug-non-zts-20180731/blackfire-1.92.1 diff --git a/support/build/extensions/no-debug-non-zts-20190902/blackfire-1.90.0 b/support/build/extensions/no-debug-non-zts-20190902/blackfire-1.92.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20190902/blackfire-1.90.0 rename to support/build/extensions/no-debug-non-zts-20190902/blackfire-1.92.1 diff --git a/support/build/extensions/no-debug-non-zts-20200930/blackfire-1.90.0 b/support/build/extensions/no-debug-non-zts-20200930/blackfire-1.92.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20200930/blackfire-1.90.0 rename to support/build/extensions/no-debug-non-zts-20200930/blackfire-1.92.1 diff --git a/support/build/extensions/no-debug-non-zts-20210902/blackfire-1.90.0 b/support/build/extensions/no-debug-non-zts-20210902/blackfire-1.92.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20210902/blackfire-1.90.0 rename to support/build/extensions/no-debug-non-zts-20210902/blackfire-1.92.1 diff --git a/support/build/extensions/no-debug-non-zts-20220829/blackfire-1.90.0 b/support/build/extensions/no-debug-non-zts-20220829/blackfire-1.92.1 similarity index 100% rename from support/build/extensions/no-debug-non-zts-20220829/blackfire-1.90.0 rename to support/build/extensions/no-debug-non-zts-20220829/blackfire-1.92.1 From b67fc790a76cda4dd82ebf1deeb1267ec8e2363e Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Wed, 29 Nov 2023 13:11:27 +0100 Subject: [PATCH 8/8] v241 date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49bf242346..36ab500d8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # heroku-buildpack-php CHANGELOG -## v241 (2023-11-??) +## v241 (2023-11-29) - PHP/8.1.26 [David Zuelke] - PHP/8.2.13 [David Zuelke]