Merge pull request #86 from sfackler/metadata

Switch to using cargo-metadata
sfackler · Dec 30, 2019 · c7e563d · c7e563d
2 parents de50a9d + 9dc0346
commit c7e563d
Show file tree

Hide file tree

Showing 9 changed files with 717 additions and 1,704 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,39 +1,23 @@
-deps_key: &DEPS_KEY
-  key: dependencies-1.40-{{ checksum "Cargo.lock" }}
-
-restore_registry: &RESTORE_REGISTRY
-  restore_cache:
-    key: registry
-
-save_registry: &SAVE_REGISTRY
-  save_cache:
-    key: registry-{{ .BuildNum }}
-    paths:
-      - ~/.cargo/registry/index
-
-restore_deps: &RESTORE_DEPS
-  restore_cache:
-    <<: *DEPS_KEY
-
-save_deps: &SAVE_DEPS
-  save_cache:
-    <<: *DEPS_KEY
-    paths:
-      - target
-      - ~/.cargo/registry/cache
-
 version: 2
 jobs:
   build:
     docker:
-      - image: rust:1.40.0
+      - image: rustlang/rust:nightly
     steps:
       - checkout
-      - run: apt-get update
-      - run: apt-get install -y --no-install-recommends cmake zlib1g-dev
-      - <<: *RESTORE_REGISTRY
-      - <<: *RESTORE_DEPS
+      - run: rustc --version > ~/rust-version
+      - restore_cache:
+          key: registry
+      - restore_cache:
+          key: dependencies-{{ checksum "~/rust-version" }}-{{ checksum "Cargo.lock" }}
       - run: cargo build --locked
       - run: cargo run --locked -- tree
-      - <<: *SAVE_REGISTRY
-      - <<: *SAVE_DEPS
+      - save_cache:
+          key: registry-{{ .BuildNum }}
+          paths:
+            - /usr/local/cargo/registry/index
+      - save_cache:
+          key: dependencies-{{ checksum "~/rust-version" }}-{{ checksum "Cargo.lock" }}
+          paths:
+            - target
+            - /usr/local/cargo/registry/cache