Merge pull request #34 from creative-commoners/pulls/1/pgsql-default

ENH Remove pgsql as default job
silverstripe · Oct 18, 2022 · 41e9a39 · 41e9a39
2 parents a35addf + ed31d87
commit 41e9a39
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 43 deletions.
diff --git a/job_creator.php b/job_creator.php
@@ -312,16 +312,11 @@ private function createPhpunitJobs(
                 'phpunit' => true,
                 'phpunit_suite' => $suite,
             ]);
-            $matrix['include'][] = $this->createJob(1, [
-                'db' => DB_PGSQL,
-                'phpunit' => true,
-                'phpunit_suite' => $suite,
-            ]);
             // this same mysql pdo test is also created for the phpcoverage job, so only add it here if
             // not creating a phpcoverage job.
             // note: phpcoverage also runs unit tests
             if ($this->getCmsMajor() === '4' && !$this->doRunPhpCoverage($run)) {
-                $matrix['include'][] = $this->createJob(2, [
+                $matrix['include'][] = $this->createJob(1, [
                     'db' => DB_MYSQL_57_PDO,
                     'phpunit' => true,
                     'phpunit_suite' => $suite,

diff --git a/tests/JobCreatorTest.php b/tests/JobCreatorTest.php
@@ -191,23 +191,6 @@ public function provideCreateJson(): array
                     [
                         'installer_version' => '4.11.x-dev',
                         'php' => '8.0',
-                        'db' => DB_PGSQL,
-                        'composer_require_extra' => '',
-                        'composer_args' => '',
-                        'name_suffix' => '',
-                        'phpunit' => 'true',
-                        'phpunit_suite' => 'all',
-                        'phplinting' => 'false',
-                        'phpcoverage' => 'false',
-                        'endtoend' => 'false',
-                        'endtoend_suite' => 'root',
-                        'endtoend_config' => '',
-                        'js' => 'false',
-                        'name' => '8.0 pgsql phpunit all',
-                    ],
-                    [
-                        'installer_version' => '4.11.x-dev',
-                        'php' => '8.1',
                         'db' => DB_MYSQL_57_PDO,
                         'composer_require_extra' => '',
                         'composer_args' => '',
@@ -220,7 +203,7 @@ public function provideCreateJson(): array
                         'endtoend_suite' => 'root',
                         'endtoend_config' => '',
                         'js' => 'false',
-                        'name' => '8.1 mysql57pdo phpunit all',
+                        'name' => '8.0 mysql57pdo phpunit all',
                     ],
                     [
                         'installer_version' => '4.11.x-dev',
@@ -269,23 +252,6 @@ public function provideCreateJson(): array
                         'js' => 'false',
                         'name' => '8.1 prf-low mysql57 phpunit all',
                     ],
-                    [
-                        'installer_version' => '5.x-dev',
-                        'php' => '8.1',
-                        'db' => DB_PGSQL,
-                        'composer_require_extra' => '',
-                        'composer_args' => '',
-                        'name_suffix' => '',
-                        'phpunit' => 'true',
-                        'phpunit_suite' => 'all',
-                        'phplinting' => 'false',
-                        'phpcoverage' => 'false',
-                        'endtoend' => 'false',
-                        'endtoend_suite' => 'root',
-                        'endtoend_config' => '',
-                        'js' => 'false',
-                        'name' => '8.1 pgsql phpunit all',
-                    ],
                     [
                         'installer_version' => '5.x-dev',
                         'php' => '8.1',
@@ -549,9 +515,9 @@ public function testDynamicMatrix(string $value, int $jobCount)
     public function provideDynamicMatrix(): array
     {
         return [
-            ['true', 4],
+            ['true', 3],
             ['false', 0],
-            ['', 4],
+            ['', 3],
         ];
     }