From cdeaecdeb675f247e42e0ae867c7117c7ff7329b Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Mon, 29 Jan 2024 12:41:17 +1300 Subject: [PATCH] ENH Add new marker to avoid unnecessary setup (#77) --- job_creator.php | 1 + tests/JobCreatorTest.php | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/job_creator.php b/job_creator.php index 1066fe6..f5be200 100644 --- a/job_creator.php +++ b/job_creator.php @@ -129,6 +129,7 @@ public function createJob(int $phpIndex, array $opts): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => false, + 'needs_full_setup' => $this->installerVersion !== '', ]; return array_merge($default, $opts); } diff --git a/tests/JobCreatorTest.php b/tests/JobCreatorTest.php index 21e8d32..b486e88 100644 --- a/tests/JobCreatorTest.php +++ b/tests/JobCreatorTest.php @@ -43,6 +43,7 @@ public function provideCreateJob(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => false, + 'needs_full_setup' => false, ]], // test that NO_INSTALLER_LOCKSTEPPED_REPOS base max PHP version from $branch ['myaccount/silverstripe-installer', '4.10', 99, [], [ @@ -193,6 +194,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '7.4 prf-low mysql57 phpunit all', ], [ @@ -211,6 +213,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.0 mysql57pdo phpunit all', ], [ @@ -229,6 +232,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.1 mysql80 phpunit all', ], ] @@ -259,6 +263,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.1 prf-low mysql57 phpunit all', ], [ @@ -276,6 +281,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.2 mariadb phpunit all', ], [ @@ -293,6 +299,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.3 mysql80 phpunit all', ], ] @@ -323,6 +330,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.1 prf-low mysql57 phpunit all', ], [ @@ -340,6 +348,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.1 mariadb phpunit all', ], [ @@ -357,6 +366,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.2 mysql80 phpunit all', ], ] @@ -387,6 +397,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.1 prf-low mysql57 phpunit all', ], [ @@ -404,6 +415,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.2 mariadb phpunit all', ], [ @@ -421,6 +433,7 @@ public function provideCreateJson(): array 'endtoend_suite' => 'root', 'endtoend_config' => '', 'js' => 'false', + 'needs_full_setup' => 'true', 'name' => '8.3 mysql80 phpunit all', ], ]