From 61f0dcef022104c29d24d909e93beb0603b6c8dd Mon Sep 17 00:00:00 2001 From: sayan goswami Date: Tue, 30 Jul 2024 13:38:27 +0530 Subject: [PATCH 1/6] Back to dev --- config/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/VERSION b/config/VERSION index bf86127e6..02eb221b6 100644 --- a/config/VERSION +++ b/config/VERSION @@ -1 +1 @@ -v4.13.0 \ No newline at end of file +v4.14.0-dev \ No newline at end of file From c439b9157fc9e25abac59091823495e625067906 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Tue, 30 Jul 2024 19:26:05 +0530 Subject: [PATCH 2/6] Add ORCA_PHPUNIT_DEBUG_MODE_ENABLE variable (#599) * Add new variable * conditionally add variable * Update src/Enum/EnvVarEnum.php Co-authored-by: Travis Carden * Update config/services.yml Co-authored-by: Travis Carden * Update src/Enum/EnvVarEnum.php Co-authored-by: Travis Carden * update variable --------- Co-authored-by: Travis Carden --- config/services.yml | 1 + src/Domain/Tool/Phpunit/PhpUnitTask.php | 5 ++++- src/Enum/EnvVarEnum.php | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/config/services.yml b/config/services.yml index 29601bf02..dd25c210b 100644 --- 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 index 4485bf561..4f3da4f6c 100644 --- a/src/Domain/Tool/Phpunit/PhpUnitTask.php +++ b/src/Domain/Tool/Phpunit/PhpUnitTask.php @@ -419,9 +419,12 @@ protected function runPhpUnit(): void { $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', "--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 index cf3d74be0..55822bf74 100644 --- 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', From c3decdf53c2d3cc2ec054eb923491e2bd21769eb Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Fri, 2 Aug 2024 12:54:02 +0530 Subject: [PATCH 3/6] Update orca.yml (#604) --- .github/workflows/orca.yml | 43 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/orca.yml b/.github/workflows/orca.yml index eba6f2a02..41d540a99 100644 --- 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,21 +76,29 @@ 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 From 8bdba504dcc54f5c544beafdc79a6282a8ed7e70 Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Fri, 9 Aug 2024 13:14:23 +0530 Subject: [PATCH 4/6] Make LIVE tests run on php 8.3 and upgrade yarn (#606) * Live test should run on php 8.3 only * upgrade yarn * Update orca.yml * Revert "Update orca.yml" This reverts commit a4fb6423ecf6eddff828e479a7cc2756f77e8f25. * use github to upgrade yarn * yarn install * Revert "yarn install" This reverts commit 1366baac9d5faad10ab840b93d2a3d4175eed1f6. * Revert "use github to upgrade yarn" This reverts commit 87c705f29c260610cc4fc2d61078a7a734a570b0. * Reapply "Update orca.yml" This reverts commit 6ee0b64e9cd20176bd6f81c8e8d92cb418372e6b. * update examples * Update examples * New approach --- .github/workflows/live-test.yml | 2 +- .github/workflows/orca.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/live-test.yml b/.github/workflows/live-test.yml index bb69e5cb0..8d0cf5a73 100644 --- 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 index 41d540a99..39e2b4f74 100644 --- a/.github/workflows/orca.yml +++ b/.github/workflows/orca.yml @@ -103,6 +103,9 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Install latest Yarn + run: corepack enable + - uses: actions/setup-node@v3 with: node-version: 20.x From d6babdae19d34624003294b327c92162f3b612bd Mon Sep 17 00:00:00 2001 From: Sayan Goswami Date: Mon, 12 Aug 2024 14:05:46 +0530 Subject: [PATCH 5/6] Gitlab coverage related changes (#608) * use coverage--text * use color:never * revert color settings * revert color to never --- src/Domain/Tool/Phpunit/PhpUnitTask.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Domain/Tool/Phpunit/PhpUnitTask.php b/src/Domain/Tool/Phpunit/PhpUnitTask.php index 4f3da4f6c..07a35fba2 100644 --- a/src/Domain/Tool/Phpunit/PhpUnitTask.php +++ b/src/Domain/Tool/Phpunit/PhpUnitTask.php @@ -415,6 +415,7 @@ protected function runPhpUnit(): void { } if ($this->shouldGenerateCodeCoverageInCobertura()) { + $command[] = "--coverage-text"; $command[] = "--coverage-cobertura={$this->coberturaCoverage}"; $this->processRunner->addEnvVar("XDEBUG_MODE", "coverage"); } @@ -424,7 +425,7 @@ protected function runPhpUnit(): void { } $command = array_merge($command, [ - '--colors=always', + '--colors=never', "--configuration={$this->fixture->getPath('docroot/core/phpunit.xml')}", '--exclude-group=orca_ignore', '--testsuite=orca', From d23bd7cdcd0dfb059ae2cb8c2392eb0b27de6a67 Mon Sep 17 00:00:00 2001 From: sayan goswami Date: Mon, 12 Aug 2024 20:12:58 +0530 Subject: [PATCH 6/6] Updated version --- config/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/VERSION b/config/VERSION index 02eb221b6..8f1e770b8 100644 --- a/config/VERSION +++ b/config/VERSION @@ -1 +1 @@ -v4.14.0-dev \ No newline at end of file +v4.14.0 \ No newline at end of file