Skip to content

Commit 5b4366e

Browse files
committed
skip installs after platform package requires in tests
We don't want package installs, since that creates a vendor/ directory; just the lock file update is enough.
1 parent bdcc82b commit 5b4366e

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

test/spec/blackfire_shared.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,28 @@
2121
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
2222
buildpacks: buildpacks,
2323
config: credentials.merge({ "BLACKFIRE_LOG_LEVEL" => "4"}),
24-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:*' 'ext-blackfire:*'") or raise "Failed to require PHP/ext-blackfire" }
24+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs 'php:*' 'ext-blackfire:*'") or raise "Failed to require PHP/ext-blackfire" }
2525
)
2626
elsif mode == "without BLACKFIRE_SERVER_TOKEN"
2727
# ext-blackfire is listed as a dependency in composer.json, but a BLACKFIRE_SERVER_TOKEN/ID is missing
2828
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
2929
buildpacks: buildpacks,
3030
config: { "BLACKFIRE_LOG_LEVEL" => "4" },
31-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:*' 'ext-blackfire:*'") or raise "Failed to require PHP/ext-blackfire" }
31+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs 'php:*' 'ext-blackfire:*'") or raise "Failed to require PHP/ext-blackfire" }
3232
)
3333
elsif mode == "with default BLACKFIRE_LOG_LEVEL"
3434
# ext-blackfire is listed as a dependency in composer.json, and BLACKFIRE_LOG_LEVEL is the default (1=error)
3535
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
3636
buildpacks: buildpacks,
3737
config: credentials,
38-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:*' 'ext-blackfire:*'") or raise "Failed to require PHP/ext-blackfire" }
38+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs 'php:*' 'ext-blackfire:*'") or raise "Failed to require PHP/ext-blackfire" }
3939
)
4040
else
4141
# a BLACKFIRE_SERVER_TOKEN/ID triggers the automatic installation of ext-blackfire at the end of the build
4242
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
4343
buildpacks: buildpacks,
4444
config: credentials.merge({ "BLACKFIRE_LOG_LEVEL" => "4"}),
45-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:*'") or raise "Failed to require PHP version" }
45+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs 'php:*'") or raise "Failed to require PHP version" }
4646
)
4747
end
4848
@app.deploy

test/spec/newrelic_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
# ext-newrelic is listed as a dependency in composer.json, and a NEW_RELIC_LICENSE_KEY is provided
1010
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
1111
config: { "NEW_RELIC_LOG_LEVEL" => "info", "NEW_RELIC_LICENSE_KEY" => "somethingfake" },
12-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:8.3.*' 'ext-newrelic:*'") or raise "Failed to require PHP/ext-newrelic" }
12+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs 'php:8.3.*' 'ext-newrelic:*'") or raise "Failed to require PHP/ext-newrelic" }
1313
)
1414
elsif mode == "without NEW_RELIC_LICENSE_KEY"
1515
# ext-newrelic is listed as a dependency in composer.json, but a NEW_RELIC_LICENSE_KEY is missing
1616
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
1717
config: { "NEW_RELIC_LOG_LEVEL" => "info" },
18-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:8.3.*' 'ext-newrelic:*'") or raise "Failed to require PHP/ext-newrelic" }
18+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs 'php:8.3.*' 'ext-newrelic:*'") or raise "Failed to require PHP/ext-newrelic" }
1919
)
2020
elsif mode == "with default NEW_RELIC_LOG_LEVEL"
2121
# ext-newrelic is listed as a dependency in composer.json, and NEW_RELIC_LOG_LEVEL is the default (warning)
2222
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
2323
config: { "NEW_RELIC_LICENSE_KEY" => "somethingfake" },
24-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:8.3.*' 'ext-newrelic:*'") or raise "Failed to require PHP/ext-newrelic" }
24+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs 'php:8.3.*' 'ext-newrelic:*'") or raise "Failed to require PHP/ext-newrelic" }
2525
)
2626
else
2727
# a NEW_RELIC_LICENSE_KEY triggers the automatic installation of ext-newrelic at the end of the build
2828
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
2929
config: { "NEW_RELIC_LOG_LEVEL" => "info", "NEW_RELIC_LICENSE_KEY" => "thiswilltriggernewrelic" },
30-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs 'php:8.3.*'") or raise "Failed to require PHP version" }
30+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs 'php:8.3.*'") or raise "Failed to require PHP version" }
3131
)
3232
end
3333
@app.deploy

test/spec/php_base_shared.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
before(:all) do
99
@app = new_app_with_stack_and_platrepo('test/fixtures/default',
10-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs php '#{series}.*'") or raise "Failed to require PHP version" }
10+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs php '#{series}.*'") or raise "Failed to require PHP version" }
1111
)
1212
@app.deploy
1313

test/spec/php_boot_shared.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def self.gencmd(args)
8484
context "running PHP #{series} and the #{server} web server" do
8585
before(:all) do
8686
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
87-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs php '#{series}.*'") or raise "Failed to require PHP version" },
87+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs php '#{series}.*'") or raise "Failed to require PHP version" },
8888
run_multi: true
8989
)
9090
@app.deploy

test/spec/php_concurrency_shared.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
context "running PHP #{series} and the #{server} web server" do
77
before(:all) do
88
@app = new_app_with_stack_and_platrepo('test/fixtures/bootopts',
9-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs php '#{series}.*'") or raise "Failed to require PHP version" },
9+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs php '#{series}.*'") or raise "Failed to require PHP version" },
1010
run_multi: true
1111
)
1212
@app.deploy

test/spec/php_sigterm_shared.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
context "that uses PHP #{series} and the #{server} web server" do
55
before(:all) do
66
@app = new_app_with_stack_and_platrepo('test/fixtures/sigterm',
7-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs php '#{series}.*'") or raise "Failed to require PHP version" },
7+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs php '#{series}.*'") or raise "Failed to require PHP version" },
88
run_multi: true
99
)
1010
@app.deploy

test/spec/platform_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
context "of a project that has invalid platform dependencies" do
237237
let(:app) {
238238
new_app_with_stack_and_platrepo('test/fixtures/default',
239-
before_deploy: -> { system("composer require --quiet --ignore-platform-reqs php '99.*'") or raise "Failed to require PHP version" },
239+
before_deploy: -> { system("composer require --quiet --no-install --ignore-platform-reqs php '99.*'") or raise "Failed to require PHP version" },
240240
run_multi: true,
241241
allow_failure: true
242242
)

0 commit comments

Comments
 (0)