From 6afdfc7fbdded347eea4f333d0370322bbe29501 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor1984@riseup.net>
Date: Wed, 22 Mar 2017 11:01:29 -0300
Subject: [bug] cache pip instead of tox

Caching .tox breaks when installing new dependencies. Caching pip
instead and asking tox to always recreate will ensure newer dependencies
are installed while getting existing ones from cache.
---
 .gitlab-ci.yml  | 7 +++++--
 testing/tox.ini | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cafdf54..f5a68f1e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,13 @@ stages:
   - tests
   - benchmark
 
-# Cache tox envs between builds
+# Cache a folder between builds.
+# Tox sets it to be our pip cache.
 cache:
+  untracked: true
+  key: soledad-shared-pip-cache
   paths:
-  - testing/.tox/
+  - testing/.cache/
 
 before_script:
   - echo "Running on ${HOST_HOSTNAME:=$(hostname)}"
diff --git a/testing/tox.ini b/testing/tox.ini
index d800d988..0e4b2683 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -29,6 +29,7 @@ deps =
 setenv =
     HOME=/tmp
     TERM=xterm
+    XDG_CACHE_HOME=./.cache/
 install_command = pip install {opts} {packages}
 
 [testenv:py34]
-- 
cgit v1.2.3