Merge branch 'release/4.14.0'

acquia · Aug 12, 2024 · b01bf8d · b01bf8d
2 parents e8352a5 + d23bd7c
commit b01bf8d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 25 deletions.
diff --git a/.github/workflows/live-test.yml b/.github/workflows/live-test.yml
@@ -33,7 +33,7 @@ jobs:
       matrix:
         orca-job:
           - " "
-        php-version: [ "8.1", "8.3" ]
+        php-version: [ "8.3" ]
     steps:
       - uses: actions/checkout@v2
 

diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml
@@ -61,17 +61,10 @@ jobs:
           - ISOLATED_TEST_ON_NEXT_MINOR_DEV
           # - INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR_DEV
           - LOOSE_DEPRECATED_CODE_SCAN
-        php-version: [ "8.1", "8.3" ]
+        php-version: [ "8.3" ]
         orca-enable-nightwatch: [ "FALSE" ]
         orca-coverage-enable: [ "TRUE" ]
         include:
-          # Testing Drupal 10 in php 8.1 with nightwatch and coverage.
-          - orca-job: ISOLATED_TEST_ON_CURRENT
-            php-version: "8.1"
-            orca-enable-nightwatch: "TRUE"
-            # Testing coverage generation in Clover format when ORCA_COVERAGE_ENABLE is TRUE.
-            orca-coverage-enable: "TRUE"
-
           # Testing Drupal 10 in php 8.3.
           - orca-job: ISOLATED_TEST_ON_CURRENT
             php-version: "8.3"
@@ -83,25 +76,36 @@ jobs:
           - orca-job: INTEGRATED_TEST_ON_LATEST_EOL_MAJOR
             php-version: "8.1"
 
-          # Testing Drupal 11 in php 8.3.
-          - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
-            php-version: "8.3"
-
-          # Testing Drupal 11 in php 8.3.
-          - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
-            php-version: "8.3"
+          # Testing Drupal 10 in php 8.1.
+          - orca-job: INTEGRATED_TEST_ON_OLDEST_SUPPORTED
+            php-version: "8.1"
 
-          # Testing Drupal 11 in php 8.3.
-          - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
-            php-version: "8.3"
+          # Testing Drupal 10 in php 8.1.
+          - orca-job: INTEGRATED_TEST_ON_LATEST_LTS
+            php-version: "8.1"
 
-          # Testing Drupal 11 in php 8.3.
-          - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
-            php-version: "8.3"
+#          # Testing Drupal 11 in php 8.3.
+#          - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
+#            php-version: "8.3"
+#
+#          # Testing Drupal 11 in php 8.3.
+#          - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
+#            php-version: "8.3"
+#
+#          # Testing Drupal 11 in php 8.3.
+#          - orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
+#            php-version: "8.3"
+#
+#          # Testing Drupal 11 in php 8.3.
+#          - orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
+#            php-version: "8.3"
 
     steps:
       - uses: actions/checkout@v3
 
+      - name: Install latest Yarn
+        run: corepack enable
+
       - uses: actions/setup-node@v3
         with:
           node-version: 20.x

diff --git a/config/VERSION b/config/VERSION
@@ -1 +1 @@
-v4.13.0
+v4.14.0
diff --git a/config/services.yml b/config/services.yml
@@ -13,6 +13,7 @@ parameters:
   ORCA_PACKAGES_CONFIG: "%env(ORCA_PACKAGES_CONFIG)%"
   env(ORCA_PACKAGES_CONFIG_ALTER): ~
   env(ORCA_PHPCS_STANDARD): "AcquiaDrupalTransitional"
+  env(ORCA_PHPUNIT_DEBUG_MODE_ENABLE): "false"
   env(ORCA_TELEMETRY_ENABLE): "false"
   env(ORCA_IS_ALLOWED_FAILURE): "%env(ORCA_IS_ALLOWED_FAILURE)%"
 

diff --git a/src/Domain/Tool/Phpunit/PhpUnitTask.php b/src/Domain/Tool/Phpunit/PhpUnitTask.php
@@ -415,13 +415,17 @@ protected function runPhpUnit(): void {
       }
 
       if ($this->shouldGenerateCodeCoverageInCobertura()) {
+        $command[] = "--coverage-text";
         $command[] = "--coverage-cobertura={$this->coberturaCoverage}";
         $this->processRunner->addEnvVar("XDEBUG_MODE", "coverage");
       }
 
+      if ($this->envFacade->get('ORCA_PHPUNIT_DEBUG_MODE_ENABLE') === 'true') {
+        $command[] = '--debug';
+      }
+
       $command = array_merge($command, [
-        '--colors=always',
-        '--debug',
+        '--colors=never',
         "--configuration={$this->fixture->getPath('docroot/core/phpunit.xml')}",
         '--exclude-group=orca_ignore',
         '--testsuite=orca',

diff --git a/src/Enum/EnvVarEnum.php b/src/Enum/EnvVarEnum.php
@@ -18,6 +18,7 @@
  * @method static EnvVarEnum ORCA_PACKAGES_CONFIG()
  * @method static EnvVarEnum ORCA_PACKAGES_CONFIG_ALTER()
  * @method static EnvVarEnum ORCA_PHPCS_STANDARD()
+ * @method static EnvVarEnum ORCA_PHPUNIT_DEBUG_MODE_ENABLE()
  * @method static EnvVarEnum ORCA_ROOT()
  * @method static EnvVarEnum ORCA_SUT_BRANCH()
  * @method static EnvVarEnum ORCA_SUT_DIR()
@@ -68,6 +69,9 @@ class EnvVarEnum extends Enum {
 
   public const ORCA_PHPCS_STANDARD = 'ORCA_PHPCS_STANDARD';
 
+
+  public const ORCA_PHPUNIT_DEBUG_MODE_ENABLE = 'ORCA_PHPUNIT_DEBUG_MODE_ENABLE';
+
   public const ORCA_ROOT = 'ORCA_ROOT';
 
   public const ORCA_SUT_BRANCH = 'ORCA_SUT_BRANCH';
@@ -125,6 +129,7 @@ public static function descriptions(): array {
       self::ORCA_PACKAGES_CONFIG => 'The path to a config file to completely replace the list of packages ORCA installs in fixtures and runs tests on',
       self::ORCA_PACKAGES_CONFIG_ALTER => 'The path to a config file to alter the main list of packages ORCA installs in fixtures and runs tests on',
       self::ORCA_PHPCS_STANDARD => 'The PHP Code Sniffer standard to use',
+      self::ORCA_PHPUNIT_DEBUG_MODE_ENABLE => 'Whether or not to run PHPUnit in debug mode',
       self::ORCA_ROOT => 'The path to the root of ORCA itself (Read-only)',
       self::ORCA_SUT_BRANCH => 'The name of the nearest Git version branch of the SUT',
       self::ORCA_SUT_DIR => 'The path to the SUT',