From 1f44dad2fafd9ecd31b860c4d3e59d9ef68d4832 Mon Sep 17 00:00:00 2001 From: Bec White Date: Mon, 18 May 2020 16:07:25 -0500 Subject: [PATCH 1/3] Reinstate drupal-check in the-build's own CI testing. --- .circleci/config.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a4233d29..2e86012b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,6 +46,19 @@ jobs: name: Configure URL in /etc/hosts command: echo 127.0.0.1 ${CIRCLE_PROJECT_REPONAME}.local | sudo tee -a /etc/hosts + # Note: phing and drupal-check have mutually exclusive requirements. + # It'd be better to add drupal-check as a dependency of the drupal project + # rather than as part of the virtual environment, but this will have to do + # for now. Also note, drupal-check is added as part of the-vagrant so it + # is available to run within our VM. + - run: + name: Install drupal-check + command: | + curl -O -L https://github.com/mglaman/drupal-check/releases/download/1.0.9/drupal-check.phar + mkdir --parents ~/bin + mv drupal-check.phar ~/bin/drupal-check + chmod +x ~/bin/drupal-check + # Composer package cache - restore_cache: keys: From 325db9f565441ef04d233b569cafc3d6c2b5c45f Mon Sep 17 00:00:00 2001 From: Bec White Date: Mon, 18 May 2020 16:39:09 -0500 Subject: [PATCH 2/3] Add a note re: pinning drupal-check to a known stable version. --- .circleci/config.yml | 1 + defaults/install/.circleci/config.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e86012b..94003734 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,6 +51,7 @@ jobs: # rather than as part of the virtual environment, but this will have to do # for now. Also note, drupal-check is added as part of the-vagrant so it # is available to run within our VM. + # Note 2: drupal-check is pinned to a known stable version. - run: name: Install drupal-check command: | diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml index ff29de60..91447774 100644 --- a/defaults/install/.circleci/config.yml +++ b/defaults/install/.circleci/config.yml @@ -48,6 +48,7 @@ jobs: # rather than as part of the virtual environment, but this will have to do # for now. Also note, drupal-check is added as part of the-vagrant so it # is available to run within our VM. + # Note 2: drupal-check is pinned to a known stable version. - run: name: Install drupal-check command: | From 2e8e2be42d69104c5a92c4d32aac565b7cb1ff64 Mon Sep 17 00:00:00 2001 From: Bec White Date: Mon, 18 May 2020 16:42:18 -0500 Subject: [PATCH 3/3] Save the composer cache later in the-build's CI process, as composer is used later in the process as well. --- .circleci/config.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 94003734..53e64ab9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,16 +90,6 @@ jobs: paths: - ".git" - - # Composer package cache - update when the contents of the Composer cache directory - # change - - run: ls -1R ~/.composer/cache/ > /tmp/composer-cache.txt - - save_cache: - key: composer-v1-{{ checksum "/tmp/composer-cache.txt" }} - paths: - - ~/.composer - - # Install the-build - run: name: Install the-build in the project @@ -115,6 +105,15 @@ jobs: name: Install Drupal command: printf 'y' | vendor/bin/phing install -Ddrupal.validate_clean_config.bypass=yes + # Composer package cache - update when the contents of the Composer cache directory + # change. This cache is saved after installing Drupal, as the install process uses + # composer to add a few modules. + - run: ls -1R ~/.composer/cache/ > /tmp/composer-cache.txt + - save_cache: + key: composer-v1-{{ checksum "/tmp/composer-cache.txt" }} + paths: + - ~/.composer + # Add a multisite - run: name: Add a multisite to the project