From 9d2136cdb1db5c272f818fa92282acdd5060eed3 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Tue, 5 May 2020 18:21:52 +1000 Subject: [PATCH] Fixed incorrect token module version installed for legacy CI tests. --- .circleci/build.sh | 3 +++ .circleci/config.yml | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/.circleci/build.sh b/.circleci/build.sh index 4bca951..3672364 100755 --- a/.circleci/build.sh +++ b/.circleci/build.sh @@ -32,6 +32,9 @@ else php -d memory_limit=-1 "$(command -v composer)" create-project drupal-composer/drupal-project:8.x-dev build --no-interaction fi +echo "==> Install explicitly defined dev dependencies from COMPOSER_DEV_DEPENDENCIES" +[ -n "$COMPOSER_DEV_DEPENDENCIES" ] && composer --working-dir=build require "$COMPOSER_DEV_DEPENDENCIES" + echo "==> Install additional dev dependencies from module's composer.json" cat <<< "$(jq --indent 4 -M -s '.[0] * .[1]' composer.json build/composer.json)" > build/composer.json php -d memory_limit=-1 "$(command -v composer)" --working-dir=build update --lock diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f3aa9d..455a716 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,6 +43,10 @@ jobs: # Drupal project commit before moving 8.8.0. # https://github.com/drupal-composer/drupal-project/commit/53f6910c35db73d0b367d5b6f22be4af94dd1af3 DRUPAL_PROJECT_SHA: 53f6910c35db73d0b367d5b6f22be4af94dd1af3 + # Install explicilty specified version of token module due to incorrect + # constraints in composer.json. + # @see: https://www.drupal.org/project/token/issues/3131368 + COMPOSER_DEV_DEPENDENCIES: "drupal/token:1.6" <<: *job-build build-php-7.2-legacy: @@ -54,6 +58,10 @@ jobs: # Drupal project commit before moving 8.8.0. # https://github.com/drupal-composer/drupal-project/commit/53f6910c35db73d0b367d5b6f22be4af94dd1af3 DRUPAL_PROJECT_SHA: 53f6910c35db73d0b367d5b6f22be4af94dd1af3 + # Install explicilty specified version of token module due to incorrect + # constraints in composer.json. + # @see: https://www.drupal.org/project/token/issues/3131368 + COMPOSER_DEV_DEPENDENCIES: "drupal/token:1.6" <<: *job-build deploy: