Fix caching of fonts in CircleCI builds.

QuLogic · QuLogic · commit af1bd3e7f141 · 2020-04-17T21:14:45.000-04:00
The `save_cache and `restore_cache` entries need to be separate steps,
not keys on the `run` step.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,17 +30,18 @@ apt-run:  &apt-install
       fonts-humor-sans
 
 fonts-run:  &fonts-install
-  name: Install custom fonts
-  command: |
-    mkdir -p ~/.local/share/fonts
-    wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
-    fc-cache -f -v
-  save_cache:
-    key: fonts-2
-    paths:
-      - ~/.local/share/fonts/
-  restore_cache:
-    key: fonts-2
+  - restore_cache:
+      key: fonts-2
+  - run:
+      name: Install custom fonts
+      command: |
+        mkdir -p ~/.local/share/fonts
+        wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
+        fc-cache -f -v
+  - save_cache:
+      key: fonts-2
+      paths:
+        - ~/.local/share/fonts/
 
 pip-run:  &pip-install
   # Upgrade pip and setuptools and wheel to get as clean an install as possible
@@ -87,7 +88,7 @@ jobs:
       - checkout
 
       - run: *apt-install
-      - run: *fonts-install
+      - *fonts-install
       - run: *pip-install
       - run:
            <<: *deps-install
@@ -111,7 +112,7 @@ jobs:
       - checkout
 
       - run: *apt-install
-      - run: *fonts-install
+      - *fonts-install
       - run: *pip-install
 
       - run: *deps-install
@@ -133,7 +134,7 @@ jobs:
       - checkout
 
       - run: *apt-install
-      - run: *fonts-install
+      - *fonts-install
       - run: *pip-install
 
       - run: *deps-install
