Merge pull request #8 from KnpLabs/fix/circleci-cache

[RFR] fix circleci cache archive

.circleci/config.yml

@@ -14,14 +14,22 @@ reference:
   restore_cache_step: &restore_cache_step
     restore_cache:
       keys:
-        - cargo-{{ checksum "Cargo.lock" }}
-        - cargo-
+        - cargo-v3-{{ checksum "Cargo.lock" }}
+        - cargo-v3-
+
+  enlight_cache_step: &enlight_cache_step
+    run:
+      name: Enlight cache
+      # @see https://docs.travis-ci.com/user/languages/rust/#dependency-management
+      # Use sudo due to the different uid between circleci user and docker user
+      command: sudo rm -rf .cargo/registry/src
 
   save_cache_step: &save_cache_step
     save_cache:
-      key: cargo-{{ checksum "Cargo.lock" }}
+      key: cargo-v3-{{ checksum "Cargo.lock" }}
       paths:
         - .cargo/
+        - target/
 
   build_docker_image_step: &build_docker_image_step
     run:
@@ -66,6 +74,7 @@ jobs:
       - <<: *chown_working_directory_step
       - <<: *run_unit_tests_step
       - <<: *run_functional_tests_step
+      - <<: *enlight_cache_step
       - <<: *save_cache_step
 
   release_job:

Makefile

@@ -1,3 +1,9 @@
+TEST_FLAGS ?=
+
+ifneq (,$(CI))
+    TEST_FLAGS=--release
+endif
+
 .PHONY: build
 build:
 	docker-compose build
@@ -16,11 +22,11 @@ build-release:
 .PHONY: test-unit
 test-unit:
 	docker-compose run --rm app \
-		cargo test --tests \
+		cargo test --tests $(TEST_FLAGS) \
 		-p ci \
 		# add the other packages to test with the -p flag
 
 .PHONY: test-functional
 test-functional:
 	docker-compose run --rm app \
-		cargo test --tests
+		cargo test --tests $(TEST_FLAGS)