From ec81b54bc04efd5f101d127cc80c43c268e69fcd Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net>
Date: Tue, 19 Dec 2017 10:46:34 +0100
Subject: Circle CI: fix cache selection.

---
 .circleci/config.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to '.circleci')

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7c250c667..27519eab2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,10 +54,17 @@ opam-switch: &opam-switch
   steps:
     - checkout
     - run: *before_script
+    - run:
+        name: Cache selection
+        command: |
+          source ~/.profile
+          # We can't use environment variables in cache names
+          # So put it in a file and use the checksum
+          echo "$COMPILER" > COMPILER
     - restore_cache:
         keys:
-          - coq-opam-cache-v1-{{ arch }}-{{ .Environment.COMPILER }}-{{ checksum ".circleci/config.yml" }}-
-          - coq-opam-cache-v1-{{ arch }}-{{ .Environment.COMPILER }}- # this grabs old cache if checksum doesn't match
+          - coq-opam-cache-v1-{{ arch }}-{{ checksum "COMPILER" }}-{{ checksum ".circleci/config.yml" }}-
+          - coq-opam-cache-v1-{{ arch }}-{{ checksum "COMPILER" }}- # this grabs old cache if checksum doesn't match
     - run:
         name: Update opam lists
         command: |
@@ -76,7 +83,7 @@ opam-switch: &opam-switch
           source ~/.profile
           rm -rf ~/.opam/log/
     - save_cache:
-        key: coq-opam-cache-v1-{{ arch }}-{{ .Environment.COMPILER }}-{{ checksum ".circleci/config.yml" }}-
+        key: coq-opam-cache-v1-{{ arch }}-{{ checksum "COMPILER" }}-{{ checksum ".circleci/config.yml" }}-
         paths:
           - ~/.opam
     - persist_to_workspace:
-- 
cgit v1.2.3