chore: Add .resources dir to all crates in ws

In order to publish the crates individually, we need to attach our resources to them. Currently this is mostly the proto files and the tls (nobody) certificates. This commit also adds `sync-files` to the root Makefile for ease of use. Signed-off-by: Peter Neuroth <[email protected]>
Blockstream · Aug 27, 2024 · 83af938 · 83af938
1 parent 62eec15
commit 83af938
Show file tree

Hide file tree

Showing 10 changed files with 1,227 additions and 15 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -9,3 +9,7 @@ Cargo.lock     linguist-generated=true -diff -merge
 
 libs/gl-client/.resources/proto/**  linguist-generated=true -diff -text -merge
 libs/gl-client/.resources/tls/**    linguist-generated=true -diff -text -merge
+libs/gl-plugin/.resources/proto/**  linguist-generated=true -diff -text -merge
+libs/gl-plugin/.resources/tls/**    linguist-generated=true -diff -text -merge
+libs/gl-signerproxy/.resources/proto/**  linguist-generated=true -diff -text -merge
+libs/gl-signerproxy/.resources/tls/**    linguist-generated=true -diff -text -merge
diff --git a/Makefile b/Makefile
@@ -22,6 +22,12 @@ else
   RSARCH = ${UNAME_M}
 endif
 
+# Path to workspace crates
+LIBS = ${REPO_ROOT}/libs
+GL_CLIENT = ${LIBS}/gl-client
+GL_PLUGIN = ${LIBS}/gl-plugin
+GL_SIGNERPROXY = ${LIBS}/gl-signerproxy
+
 ARTIFACTS = \
 	.coverage
 
@@ -52,12 +58,24 @@ DOCKER_OPTIONS= \
 	-v /tmp/gltesting/cargo/registry:/opt/cargo/registry \
 	-v ${REPO_ROOT}:/repo
 
-.PHONY: ensure-docker build-self check-self docker-image docs wheels
-
-include libs/gl-client/Makefile
 include libs/gl-client-py/Makefile
 include libs/gl-testing/Makefile
 
+# sync-files section
+.PHONY: sync-files gl_client_sync-files gl_plugin_sync-files gl_signerproxy_sync-files
+gl_client_sync-files:
+	$(MAKE) -C ${GL_CLIENT} sync-files
+
+gl_plugin_sync-files:
+	$(MAKE) -C ${GL_PLUGIN} sync-files
+
+gl_signerproxy_sync-files:
+	$(MAKE) -C ${GL_SIGNERPROXY} sync-files
+
+sync-files: gl_client_sync-files gl_plugin_sync-files gl_signerproxy_sync-files
+
+.PHONY: ensure-docker build-self check-self docker-image docs wheels
+
 check-rs:
 	cargo test --all -- --test-threads=1
 

diff --git a/libs/gl-client/Makefile b/libs/gl-client/Makefile
@@ -5,13 +5,14 @@ REPO_ROOT=$(shell git rev-parse --show-toplevel)
 endif
 
 LIBS=${REPO_ROOT}/libs
-GL_CLIENT_DIR=${LIBS}/gl-client
+SELF_DIR=${LIBS}/gl-client
 
 check-gl-client:
 	(cd ${GL_CLIENT_DIR}; cargo test)
 
+# Syncronize proto and tls files into .resources dir
 sync-files:
-	rm -rf ${GL_CLIENT_DIR}/.resource/proto .resource/tls
-	rsync -avr ${LIBS}/proto/ ${GL_CLIENT_DIR}/.resources/proto
-	rsync -avr ${LIBS}/tls/ ${GL_CLIENT_DIR}/.resources/tls
-	git add ${GL_CLIENT_DIR}/.resources
+	rsync -avr --delete --delete-excluded ${LIBS}/proto/ ${SELF_DIR}/.resources/proto
+	rsync -avr --delete --delete-excluded ${LIBS}/tls/ ${SELF_DIR}/.resources/tls
+	git add ${SELF_DIR}/.resources
+