From 2e8e2be42d69104c5a92c4d32aac565b7cb1ff64 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Mon, 18 May 2020 16:42:18 -0500
Subject: [PATCH] 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