From c33a618a44b1330aeff91e6b9cbde3902feff610 Mon Sep 17 00:00:00 2001
From: Jonathan Smith <20701-jonathan1055@users.noreply.drupalcode.org>
Date: Thu, 4 Jan 2024 08:58:53 +0000
Subject: [PATCH] Issue #3412243: Add pipeline phpunit job for previous core
version
---
.gitlab-ci.yml | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a10e17..2d54d45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,6 +49,10 @@ include:
# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
################
+variables:
+ # Add extra phpunit job for the previous core minor version.
+ OPT_IN_TEST_PREVIOUS_MINOR: 1
+
eslint:
before_script:
- echo "ESLINT version $(${CI_PROJECT_DIR}/${_WEB_ROOT}/core/node_modules/.bin/eslint --version)"
@@ -62,14 +66,30 @@ stylelint:
phpcs:
allow_failure: false
-phpunit:
+phpunit (previous minor):
+ allow_failure: false
before_script:
# Provide some context on the test run. This is also done later, but the job will halt if the patching fails, so do it here too.
- vendor/bin/drush status
# Apply core patches
- cd $CI_PROJECT_DIR/$_WEB_ROOT
- # Apply core patch from https://www.drupal.org/project/drupal/issues/2895388 which is on MR 3273
- # This includes the small tableresponsive change from issue 3331975
- # @todo Remove this when core has added the machine name and that core version is used here.
+ # Apply core patch from https://www.drupal.org/project/drupal/issues/2895388 which is on MR 3273 (for core 10.1) and MR 5496 for 10.2
+ # This adds the machine to the uninstall page and includes the small tableresponsive change from issue 3331975
+ # @todo Remove this when the above issue is committed and the new core version is used in this job step.
- curl https://git.drupalcode.org/project/drupal/-/merge_requests/3273.diff | patch -p1 --verbose
- cd $CI_PROJECT_DIR
+
+phpunit:
+ # The Tests pass at 10.1 so allow failure at 10.2
+ # See https://www.drupal.org/project/module_filter/issues/3412061
+ allow_failure: true
+ before_script:
+ # Provide some context on the test run. This is also done later, but the job will halt if the patching fails, so do it here too.
+ - vendor/bin/drush status
+ # Apply core patches
+ - cd $CI_PROJECT_DIR/$_WEB_ROOT
+ # Apply core patch from https://www.drupal.org/project/drupal/issues/2895388 which is on MR 3273 (for core 10.1) and MR 5496 for 10.2
+ # This adds the machine to the uninstall page and includes the small tableresponsive change from issue 3331975
+ # @todo Remove this when the above issue is committed and the new core version is used in this job step.
+ - curl https://git.drupalcode.org/project/drupal/-/merge_requests/5496.diff | patch -p1 --verbose
+ - cd $CI_PROJECT_DIR
--
GitLab