fixup! Fixes #15902: Only cache dependencies

Fixes #15902: Only cache dependencies
Normation · Oct 9, 2019 · 8287b1f · 8287b1f
1 parent 1af9bd8
commit 8287b1f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/relay/sources/Makefile b/relay/sources/Makefile
@@ -56,14 +56,14 @@ target/man/rudder-relayd.1.gz:
 
 
 CACHER=../../../../../build-caching
-CARGO_SHA:=$(shell sha256sum relayd/Cargo.lock | awk '{print $$1}')
 build: man rudder-pkg/rudder_plugins_key.pub autocomplete/rudder-pkg.sh
-	# Build relayd
-	[ -x $(CACHER) ] && $(CACHER) get ../../../../../.cargo/ name=cargo cargo=$(CARGO_SHA) || true
-	[ -x $(CACHER) ] && $(CACHER) get relayd/target --with-env name=relayd cargo=$(CARGO_SHA) || true
+	# Build relayd 
+	[ -x $(CACHER) ] && $(CACHER) get ../../../../../.cargo/ name=cargo major=$(RUDDER_MAJOR_VERSION) || true
+	[ -x $(CACHER) ] && $(CACHER) get relayd/target --with-env name=relayd major=$(RUDDER_MAJOR_VERSION) || true
 	cd relayd && cargo build --release --bin rudder-relayd
-	[ -x $(CACHER) ] && $(CACHER) put ../../../../../.cargo/ name=cargo cargo=$(CARGO_SHA)
-	[ -x $(CACHER) ] && $(CACHER) put relayd/target --with-env name=relayd cargo=$(CARGO_SHA)
+	# the cache is always updated and cargo will rebuild only what is needed
+	[ -x $(CACHER) ] && $(CACHER) put ../../../../../.cargo/ name=cargo major=$(RUDDER_MAJOR_VERSION)
+	[ -x $(CACHER) ] && $(CACHER) put relayd/target --with-env name=relayd major=$(RUDDER_MAJOR_VERSION)
 
 ifeq ($(SELINUX),true)
 	# Build SELinux policy package