diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 037da1f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: php -dist: xenial - -php: - - 7.3 - -services: - - mysql - -cache: - apt: true - directories: - - "$HOME/.composer/cache" - - "$HOME/.drush/cache" - - "$HOME/.npm" - -branches: - only: - - master - -env: - global: - - DRUPAL_TESTING_PROJECT_BASEDIR=${TRAVIS_BUILD_DIR}/tests/module - - PATH="$TRAVIS_BUILD_DIR/bin:$TRAVIS_BUILD_DIR/vendor/bin:$PATH" - - DRUPAL_TESTING_PHPCS_IGNORE_PATTERN="*.md" - -install: - - composer install - -script: - - test-drupal-project --verbose - -notifications: - email: false diff --git a/.travis.yml.dist b/.travis.yml.dist deleted file mode 100644 index 9dbb7d5..0000000 --- a/.travis.yml.dist +++ /dev/null @@ -1,29 +0,0 @@ -language: php -dist: xenial - -php: - - 7.3 - -services: - - mysql - -cache: - apt: true - directories: - - "$HOME/.composer/cache" - - "$HOME/.drush/cache" - - "$HOME/.npm" - -branches: - only: - - /^8\.([0-9]+|x)\-[0-9]+\.([0-9]+|x)$/ - -env: - global: - - PATH="$PATH:$HOME/.composer/vendor/bin:$HOME/.config/composer/vendor/bin" - -before_install: - - composer global require thunder/drupal-testing - -script: - - test-drupal-project diff --git a/lib/stages/build.sh b/lib/stages/build.sh index f30cf0e..838daa7 100644 --- a/lib/stages/build.sh +++ b/lib/stages/build.sh @@ -26,17 +26,18 @@ _stage_build() { installed_version=$(composer show 'drupal/core' | grep 'versions' | grep -o -E '[^ ]+$') major_version="$(cut -d'.' -f1 <<<"${installed_version}")" minor_version="$(cut -d'.' -f2 <<<"${installed_version}")" - if [[ ${major_version} -gt 8 ]] && [[ ${minor_version} -gt 0 ]]; then + if [[ ${major_version} -gt 8 ]] && [[ ${minor_version} -gt 1 ]]; then composer require phpspec/prophecy-phpunit:^2 --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}" # Apply core patch - #local docroot - #docroot=$(get_distribution_docroot) - #cd "${docroot}" || exit - #wget https://www.drupal.org/files/issues/2020-12-04/3186443-1.patch - #patch -p1 < 3186443-1.patch - #cd - || exit + local docroot + docroot=$(get_distribution_docroot) + cd "${docroot}" || exit + wget https://www.drupal.org/files/issues/2021-10-05/3240601%2B3240813-9.2.x.patch + patch -p1 < 3240601+3240813-9.2.x.patch + cd - || exit fi + # We can cleanup the name change now. composer config name "${DRUPAL_TESTING_COMPOSER_NAME}" --working-dir="${DRUPAL_TESTING_PROJECT_BASEDIR}"