From 0d209c0af49e6c010a10484cd572d6b757962d35 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 10 Jul 2018 11:42:53 -0400
Subject: [PATCH] Manage the cache around *only* virtualenv setup

We don't need anything from the cache in the bootstrap step and
Slackware cannot interact with the cache until after the bootstrap step
anyway.
---
 .circleci/config.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index caaafb497..b747c6db9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -78,6 +78,11 @@ jobs:
 
       - "checkout"
 
+      - run: &BOOTSTRAP_TEST_ENVIRONMENT
+          name: "Bootstrap test environment"
+          command: |
+            ~/project/.circleci/bootstrap-test-environment.sh ~/project "${EXTRA_PACKAGES}"
+
       - restore_cache: &RESTORE_HTTP_CACHE
           keys:
             # An exact match on the http cache key is great.  It should have
@@ -106,11 +111,6 @@ jobs:
             # than being ignored).
             - v3-wheelhouse-{{ .Environment.CIRCLE_JOB }}
 
-      - run: &BOOTSTRAP_TEST_ENVIRONMENT
-          name: "Bootstrap test environment"
-          command: |
-            ~/project/.circleci/bootstrap-test-environment.sh ~/project "${EXTRA_PACKAGES}"
-
       - run: &SETUP_VIRTUALENV
           name: "Setup virtualenv"
           # pip cannot install packages if the working directory is not
@@ -234,9 +234,6 @@ jobs:
 
       - "checkout"
 
-      - restore_cache: *RESTORE_HTTP_CACHE
-      - restore_cache: *RESTORE_WHEELHOUSE
-
       - run:
           name: "Bootstrap test environment"
           working_directory: "/tmp"
@@ -267,6 +264,9 @@ jobs:
             yum install --assumeyes \
                 net-tools
 
+      - restore_cache: *RESTORE_HTTP_CACHE
+      - restore_cache: *RESTORE_WHEELHOUSE
+
       - run: *SETUP_VIRTUALENV
 
       - save_cache: *SAVE_HTTP_CACHE
@@ -307,9 +307,6 @@ jobs:
 
       - "checkout"
 
-      - restore_cache: *RESTORE_HTTP_CACHE
-      - restore_cache: *RESTORE_WHEELHOUSE
-
       - run:
           name: "Bootstrap test environment"
           working_directory: "/tmp"
@@ -356,6 +353,9 @@ jobs:
             python get-pip.py
             pip install virtualenv
 
+      - restore_cache: *RESTORE_HTTP_CACHE
+      - restore_cache: *RESTORE_WHEELHOUSE
+
       - run: *SETUP_VIRTUALENV
 
       - save_cache: *SAVE_HTTP_CACHE