Skip to content
Snippets Groups Projects
Commit d145dddc authored by Adam G-H's avatar Adam G-H
Browse files

Issue #3440006: 3.0.x branch should not test against the next major version of Drupal core

parent e08e7ddf
No related branches found
No related tags found
1 merge request!1056Rip out next major jobs
Pipeline #143090 passed
......@@ -59,9 +59,6 @@ variables:
_PHPUNIT_TESTGROUPS: ''
# Always test against the previous minor version of core.
OPT_IN_TEST_PREVIOUS_MINOR: '1'
# Test against the next major version of core, with Automatic Updates and
# Package Manager included as core modules.
OPT_IN_TEST_NEXT_MAJOR: '1'
# @todo Remove this line when https://drupal.org/i/3414093 is fixed.
CI_DEBUG_SERVICES: "true"
_TARGET_DB_TYPE: "mariadb"
......@@ -144,24 +141,6 @@ composer (previous minor):
after_script:
- !reference [composer, after_script]
composer (next major):
allow_failure: true
before_script:
# Remove the one core patch we currently apply. We can do this because it does
# not affect Package Manager or Automatic Updates at all. We should remove this
# line once we make the converter command's calls to `patch` work properly on
# GitLab CI.
- rm ./scripts/core-patches/3331078-allow-beta.patch
- !reference [composer, before_script]
after_script:
- !reference [composer, after_script]
# Convert Automatic Updates and Package Manager to core modules.
- composer run core-convert --working-dir=$MODULE_DIR -- $CI_PROJECT_DIR/$_WEB_ROOT --gitlabci_path=$CI_PROJECT_DIR --core_target_branch=$CORE_BRANCH
# Confirm that both modules are now in core, then remove the contrib module.
- test -d $_WEB_ROOT/core/modules/auto_updates
- test -d $_WEB_ROOT/core/modules/package_manager
- rm -r -f $MODULE_DIR
composer (previous minor):
before_script:
- !reference [composer, before_script]
......@@ -179,11 +158,6 @@ phpstan:
# Ensure our PHPStan configuration has the correct include path to core's PHPStan configuration.
- sed -i "s#%rootDir%/../../../#%rootDir%/../../../$_WEB_ROOT/#" $MODULE_DIR/phpstan.neon
# Disable this job entirely; the modules are moved to core.
phpstan (next major):
rules:
- when: never
phpunit:
parallel:
matrix:
......@@ -211,39 +185,3 @@ phpunit:
phpunit (previous minor):
rules:
- !reference [phpunit, rules]
phpunit (next major):
allow_failure: true
parallel:
matrix:
- MODULE:
- auto_updates
- package_manager
TEST_TYPE:
- Unit
- Kernel
- Functional
- FunctionalJavascript
- Build
rules:
- if: $OPT_IN_TEST_NEXT_MAJOR != "1" || $SKIP_PHPUNIT == "1"
when: never
# Package Manager has no functional JavaScript tests.
- if: $MODULE == "package_manager" && $TEST_TYPE == "FunctionalJavascript"
when: never
- when: on_success
variables:
_PHPUNIT_EXTRA: '--types PHPUnit-$TEST_TYPE --module $MODULE'
# This variable prevents a deprecation error; see https://www.drupal.org/node/3422624.
MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","goog:chromeOptions":{"args":["--disable-dev-shm-usage","--disable-gpu","--headless"]}}, "http://localhost:9515"]'
# Ensure deprecations will cause tests to fail, except for deprecations that core
# specifically ignores.
SYMFONY_DEPRECATIONS_HELPER: 'ignoreFile=$CI_PROJECT_DIR/$_WEB_ROOT/core/.deprecation-ignore.txt'
# This is a really dirty hack to work around a possible bug in Drush when it runs against
# Drupal core 11.x-dev:
# https://git.drupalcode.org/project/automatic_updates/-/jobs/723857#L209
# @todo Remove this bit as soon as possible.
before_script:
- echo '#!/bin/sh' > ./vendor/bin/drush
- echo 'exit 0' >> ./vendor/bin/drush
- chmod +x ./vendor/bin/drush
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment